Index: ui/views/controls/button/custom_button.h |
diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h |
index 6c9a1629119b5947cfe2cce1f052bf0c055b1e1f..5b2935850b483187c9d6b2d3f3cfd0fcb9db7a6b 100644 |
--- a/ui/views/controls/button/custom_button.h |
+++ b/ui/views/controls/button/custom_button.h |
@@ -67,27 +67,27 @@ class VIEWS_EXPORT CustomButton : public Button, |
bool IsHotTracked() const; |
// Overridden from View: |
- virtual void OnEnabledChanged() OVERRIDE; |
- virtual const char* GetClassName() const OVERRIDE; |
- virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE; |
- virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE; |
- virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE; |
- virtual void OnMouseCaptureLost() OVERRIDE; |
- virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE; |
- virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; |
- virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; |
- virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; |
- virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE; |
- virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; |
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; |
+ virtual void OnEnabledChanged() override; |
+ virtual const char* GetClassName() const override; |
+ virtual bool OnMousePressed(const ui::MouseEvent& event) override; |
+ virtual bool OnMouseDragged(const ui::MouseEvent& event) override; |
+ virtual void OnMouseReleased(const ui::MouseEvent& event) override; |
+ virtual void OnMouseCaptureLost() override; |
+ virtual void OnMouseEntered(const ui::MouseEvent& event) override; |
+ virtual void OnMouseExited(const ui::MouseEvent& event) override; |
+ virtual void OnMouseMoved(const ui::MouseEvent& event) override; |
+ virtual bool OnKeyPressed(const ui::KeyEvent& event) override; |
+ virtual bool OnKeyReleased(const ui::KeyEvent& event) override; |
+ virtual void OnGestureEvent(ui::GestureEvent* event) override; |
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; |
virtual void ShowContextMenu(const gfx::Point& p, |
- ui::MenuSourceType source_type) OVERRIDE; |
- virtual void OnDragDone() OVERRIDE; |
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; |
- virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE; |
+ ui::MenuSourceType source_type) override; |
+ virtual void OnDragDone() override; |
+ virtual void GetAccessibleState(ui::AXViewState* state) override; |
+ virtual void VisibilityChanged(View* starting_from, bool is_visible) override; |
// Overridden from gfx::AnimationDelegate: |
- virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; |
+ virtual void AnimationProgressed(const gfx::Animation* animation) override; |
// Takes ownership of the delegate. |
void set_state_changed_delegate(CustomButtonStateChangedDelegate* delegate) { |
@@ -115,8 +115,8 @@ class VIEWS_EXPORT CustomButton : public Button, |
// Overridden from View: |
virtual void ViewHierarchyChanged( |
- const ViewHierarchyChangedDetails& details) OVERRIDE; |
- virtual void OnBlur() OVERRIDE; |
+ const ViewHierarchyChangedDetails& details) override; |
+ virtual void OnBlur() override; |
// The button state (defined in implementation) |
ButtonState state_; |