| Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
|
| diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
|
| index 6b805eae2ff345740124cfcacae9afa70e4aa62c..fd069381304452afc838de88a9fcd962187cf439 100644
|
| --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
|
| +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
|
| @@ -35,13 +35,13 @@ class BrowserNonClientFrameViewAsh
|
|
|
| void Init();
|
|
|
| - // BrowserNonClientFrameView overrides:
|
| + // BrowserNonClientFrameView:
|
| virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE;
|
| virtual int GetTopInset() const OVERRIDE;
|
| virtual int GetThemeBackgroundXInset() const OVERRIDE;
|
| virtual void UpdateThrobber(bool running) OVERRIDE;
|
|
|
| - // views::NonClientFrameView overrides:
|
| + // views::NonClientFrameView:
|
| virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
|
| virtual gfx::Rect GetWindowBoundsForClientBounds(
|
| const gfx::Rect& client_bounds) const OVERRIDE;
|
| @@ -51,12 +51,13 @@ class BrowserNonClientFrameViewAsh
|
| virtual void ResetWindowControls() OVERRIDE;
|
| virtual void UpdateWindowIcon() OVERRIDE;
|
| virtual void UpdateWindowTitle() OVERRIDE;
|
| + virtual bool DoesIntersectRect(const views::View* target,
|
| + const gfx::Rect& rect) const OVERRIDE;
|
|
|
| - // views::View overrides:
|
| + // views::View:
|
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| virtual const char* GetClassName() const OVERRIDE;
|
| - virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
|
| virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
|
| virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
|
|
| @@ -64,7 +65,7 @@ class BrowserNonClientFrameViewAsh
|
| virtual void OnMaximizeModeStarted() OVERRIDE;
|
| virtual void OnMaximizeModeEnded() OVERRIDE;
|
|
|
| - // Overridden from chrome::TabIconViewModel:
|
| + // chrome::TabIconViewModel:
|
| virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
|
| virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
|
|
|
|
|