Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: ui/views/controls/button/custom_button.h

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/color_chooser/color_chooser_view.cc ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
7 7
8 #include "ui/base/animation/animation_delegate.h" 8 #include "ui/base/animation/animation_delegate.h"
9 #include "ui/base/events.h" 9 #include "ui/base/events.h"
10 #include "ui/views/controls/button/button.h" 10 #include "ui/views/controls/button/button.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 virtual std::string GetClassName() const OVERRIDE; 80 virtual std::string GetClassName() const OVERRIDE;
81 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; 81 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
82 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; 82 virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
83 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; 83 virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
84 virtual void OnMouseCaptureLost() OVERRIDE; 84 virtual void OnMouseCaptureLost() OVERRIDE;
85 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; 85 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
86 virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; 86 virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
87 virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; 87 virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
88 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 88 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
89 virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE; 89 virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
90 virtual ui::GestureStatus OnGestureEvent( 90 virtual ui::EventResult OnGestureEvent(
91 const ui::GestureEvent& event) OVERRIDE; 91 const ui::GestureEvent& event) OVERRIDE;
92 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 92 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
93 virtual void ShowContextMenu(const gfx::Point& p, 93 virtual void ShowContextMenu(const gfx::Point& p,
94 bool is_mouse_gesture) OVERRIDE; 94 bool is_mouse_gesture) OVERRIDE;
95 virtual void OnDragDone() OVERRIDE; 95 virtual void OnDragDone() OVERRIDE;
96 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 96 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
97 97
98 // Overridden from ui::AnimationDelegate: 98 // Overridden from ui::AnimationDelegate:
99 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; 99 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
100 100
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 // See description above setter. 142 // See description above setter.
143 bool request_focus_on_press_; 143 bool request_focus_on_press_;
144 144
145 DISALLOW_COPY_AND_ASSIGN(CustomButton); 145 DISALLOW_COPY_AND_ASSIGN(CustomButton);
146 }; 146 };
147 147
148 } // namespace views 148 } // namespace views
149 149
150 #endif // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_ 150 #endif // UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_
OLDNEW
« no previous file with comments | « ui/views/color_chooser/color_chooser_view.cc ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698