Index: ui/views/widget/root_view.h |
diff --git a/ui/views/widget/root_view.h b/ui/views/widget/root_view.h |
index df01aea3d3af6e1c9fc2348d738973bb8588d12c..ad2ca4c761e3b245a62e5db6cba3226ff90a1e0c 100644 |
--- a/ui/views/widget/root_view.h |
+++ b/ui/views/widget/root_view.h |
@@ -87,42 +87,42 @@ class VIEWS_EXPORT RootView : public View, |
void LocaleChanged(); |
// Overridden from FocusTraversable: |
- virtual FocusSearch* GetFocusSearch() OVERRIDE; |
- virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; |
- virtual View* GetFocusTraversableParentView() OVERRIDE; |
+ virtual FocusSearch* GetFocusSearch() override; |
+ virtual FocusTraversable* GetFocusTraversableParent() override; |
+ virtual View* GetFocusTraversableParentView() override; |
// Overridden from ui::EventProcessor: |
- virtual ui::EventTarget* GetRootTarget() OVERRIDE; |
- virtual void OnEventProcessingStarted(ui::Event* event) OVERRIDE; |
- virtual void OnEventProcessingFinished(ui::Event* event) OVERRIDE; |
+ virtual ui::EventTarget* GetRootTarget() override; |
+ virtual void OnEventProcessingStarted(ui::Event* event) override; |
+ virtual void OnEventProcessingFinished(ui::Event* event) override; |
// Overridden from View: |
- virtual const Widget* GetWidget() const OVERRIDE; |
- virtual Widget* GetWidget() OVERRIDE; |
- virtual bool IsDrawn() const OVERRIDE; |
- virtual void Layout() OVERRIDE; |
- virtual const char* GetClassName() const OVERRIDE; |
- virtual void SchedulePaintInRect(const gfx::Rect& rect) 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 OnMouseMoved(const ui::MouseEvent& event) OVERRIDE; |
- virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE; |
- virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; |
- virtual void SetMouseHandler(View* new_mouse_handler) OVERRIDE; |
- virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; |
- virtual void UpdateParentLayer() OVERRIDE; |
+ virtual const Widget* GetWidget() const override; |
+ virtual Widget* GetWidget() override; |
+ virtual bool IsDrawn() const override; |
+ virtual void Layout() override; |
+ virtual const char* GetClassName() const override; |
+ virtual void SchedulePaintInRect(const gfx::Rect& rect) 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 OnMouseMoved(const ui::MouseEvent& event) override; |
+ virtual void OnMouseExited(const ui::MouseEvent& event) override; |
+ virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) override; |
+ virtual void SetMouseHandler(View* new_mouse_handler) override; |
+ virtual void GetAccessibleState(ui::AXViewState* state) override; |
+ virtual void UpdateParentLayer() override; |
protected: |
// Overridden from View: |
virtual void ViewHierarchyChanged( |
- const ViewHierarchyChangedDetails& details) OVERRIDE; |
- virtual void VisibilityChanged(View* starting_from, bool is_visible) OVERRIDE; |
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
+ const ViewHierarchyChangedDetails& details) override; |
+ virtual void VisibilityChanged(View* starting_from, bool is_visible) override; |
+ virtual void OnPaint(gfx::Canvas* canvas) override; |
virtual gfx::Vector2d CalculateOffsetToAncestorWithLayer( |
- ui::Layer** layer_parent) OVERRIDE; |
- virtual View::DragInfo* GetDragInfo() OVERRIDE; |
+ ui::Layer** layer_parent) override; |
+ virtual View::DragInfo* GetDragInfo() override; |
private: |
friend class ::views::RootViewTargeter; |
@@ -154,11 +154,11 @@ class VIEWS_EXPORT RootView : public View, |
View* sibling); |
// Overridden from ui::EventDispatcherDelegate: |
- virtual bool CanDispatchToTarget(ui::EventTarget* target) OVERRIDE; |
+ virtual bool CanDispatchToTarget(ui::EventTarget* target) override; |
virtual ui::EventDispatchDetails PreDispatchEvent(ui::EventTarget* target, |
- ui::Event* event) OVERRIDE; |
+ ui::Event* event) override; |
virtual ui::EventDispatchDetails PostDispatchEvent( |
- ui::EventTarget* target, const ui::Event& event) OVERRIDE; |
+ ui::EventTarget* target, const ui::Event& event) override; |
////////////////////////////////////////////////////////////////////////////// |
// Tree operations ----------------------------------------------------------- |