Index: chrome/browser/ui/views/panels/panel_frame_view.h |
diff --git a/chrome/browser/ui/views/panels/panel_frame_view.h b/chrome/browser/ui/views/panels/panel_frame_view.h |
index 0d6ad1ce9fea3b1ef484776183b6fb50f42e9c08..1232494a8f44ad717890291507cf5fffddd10a11 100644 |
--- a/chrome/browser/ui/views/panels/panel_frame_view.h |
+++ b/chrome/browser/ui/views/panels/panel_frame_view.h |
@@ -56,36 +56,36 @@ class PanelFrameView : public views::NonClientFrameView, |
private: |
// Overridden from 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; |
// Overridden from 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 Layout() OVERRIDE; |
- virtual void OnPaint(gfx::Canvas* canvas) 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 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 Layout() override; |
+ virtual void OnPaint(gfx::Canvas* canvas) 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; |
// Overridden from views::ButtonListener: |
virtual void ButtonPressed(views::Button* sender, const ui::Event& event) |
- OVERRIDE; |
+ override; |
// Overridden from chrome::TabIconViewModel: |
- virtual bool ShouldTabIconViewAnimate() const OVERRIDE; |
- virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; |
+ virtual bool ShouldTabIconViewAnimate() const override; |
+ virtual gfx::ImageSkia GetFaviconForTabIconView() override; |
int TitlebarHeight() const; |