| Index: chrome/browser/ui/views/frame/glass_browser_frame_view.h
|
| diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
|
| index 0080fd38913834363e09c8dd88b593a8afa34316..81f8092000ea711e64f6c11824f1d71ef9f635ae 100644
|
| --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h
|
| +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
|
| @@ -22,14 +22,14 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
|
| GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
|
| virtual ~GlassBrowserFrameView();
|
|
|
| - // Overridden from BrowserNonClientFrameView:
|
| + // 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;
|
| virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
|
|
| - // Overridden from views::NonClientFrameView:
|
| + // views::NonClientFrameView:
|
| virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
|
| virtual gfx::Rect GetWindowBoundsForClientBounds(
|
| const gfx::Rect& client_bounds) const OVERRIDE;
|
| @@ -39,14 +39,15 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
|
| 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;
|
|
|
| protected:
|
| - // Overridden from views::View:
|
| + // views::View:
|
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| - virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
|
|
|
| - // Overidden from views::ButtonListener:
|
| + // views::ButtonListener:
|
| virtual void ButtonPressed(views::Button* sender,
|
| const ui::Event& event) OVERRIDE;
|
|
|
|
|