| Index: apps/ui/views/app_window_frame_view.h
|
| diff --git a/apps/ui/views/app_window_frame_view.h b/apps/ui/views/app_window_frame_view.h
|
| index 7ab2d4c0969d611926495c830ea375e337ffdfa0..2baa24e26dae1322549e0e72251087435a413763 100644
|
| --- a/apps/ui/views/app_window_frame_view.h
|
| +++ b/apps/ui/views/app_window_frame_view.h
|
| @@ -68,28 +68,28 @@ class AppWindowFrameView : public views::NonClientFrameView,
|
|
|
| private:
|
| // views::NonClientFrameView implementation.
|
| - 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 implementation.
|
| - virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
| - virtual void Layout() OVERRIDE;
|
| - virtual const char* GetClassName() const OVERRIDE;
|
| - virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| - virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
| - virtual gfx::Size GetMaximumSize() const OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const override;
|
| + virtual void Layout() override;
|
| + virtual const char* GetClassName() const override;
|
| + virtual void OnPaint(gfx::Canvas* canvas) override;
|
| + virtual gfx::Size GetMinimumSize() const override;
|
| + virtual gfx::Size GetMaximumSize() const override;
|
|
|
| // views::ButtonListener implementation.
|
| virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) OVERRIDE;
|
| + const ui::Event& event) override;
|
|
|
| // Some button images we use depend on the color of the frame. This
|
| // will set these images based on the color of the frame.
|
|
|