Index: ash/frame/custom_frame_view_ash.h |
diff --git a/ash/frame/custom_frame_view_ash.h b/ash/frame/custom_frame_view_ash.h |
index 819e6fae3cb5f803f0ba6bfcdaa8690b463d3361..4abe92390382e807c86c1f830772fe39b6156c3c 100644 |
--- a/ash/frame/custom_frame_view_ash.h |
+++ b/ash/frame/custom_frame_view_ash.h |
@@ -42,25 +42,25 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView { |
ImmersiveFullscreenController* immersive_fullscreen_controller); |
// views::NonClientFrameView: |
- virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; |
+ virtual gfx::Rect GetBoundsForClientView() const override; |
virtual gfx::Rect GetWindowBoundsForClientBounds( |
- const gfx::Rect& client_bounds) const OVERRIDE; |
- virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; |
+ const gfx::Rect& client_bounds) const override; |
+ virtual int NonClientHitTest(const gfx::Point& point) override; |
virtual void GetWindowMask(const gfx::Size& size, |
- gfx::Path* window_mask) OVERRIDE; |
- virtual void ResetWindowControls() OVERRIDE; |
- virtual void UpdateWindowIcon() OVERRIDE; |
- virtual void UpdateWindowTitle() OVERRIDE; |
- virtual void SizeConstraintsChanged() OVERRIDE; |
+ gfx::Path* window_mask) override; |
+ virtual void ResetWindowControls() override; |
+ virtual void UpdateWindowIcon() override; |
+ virtual void UpdateWindowTitle() override; |
+ virtual void SizeConstraintsChanged() override; |
// views::View: |
- virtual gfx::Size GetPreferredSize() const OVERRIDE; |
- virtual const char* GetClassName() const OVERRIDE; |
- virtual gfx::Size GetMinimumSize() const OVERRIDE; |
- virtual gfx::Size GetMaximumSize() const OVERRIDE; |
- virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE; |
+ virtual gfx::Size GetPreferredSize() const override; |
+ virtual const char* GetClassName() const override; |
+ virtual gfx::Size GetMinimumSize() const override; |
+ virtual gfx::Size GetMaximumSize() const override; |
+ virtual void SchedulePaintInRect(const gfx::Rect& r) override; |
virtual void VisibilityChanged(views::View* starting_from, |
- bool is_visible) OVERRIDE; |
+ bool is_visible) override; |
// Get the view of the header. |
views::View* GetHeaderView(); |
@@ -73,7 +73,7 @@ class ASH_EXPORT CustomFrameViewAsh : public views::NonClientFrameView { |
// views::NonClientFrameView: |
virtual bool DoesIntersectRect(const views::View* target, |
- const gfx::Rect& rect) const OVERRIDE; |
+ const gfx::Rect& rect) const override; |
// Returns the container for the minimize/maximize/close buttons that is held |
// by the HeaderView. Used in testing. |