Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Side by Side Diff: chrome/browser/ui/views/frame/glass_browser_frame_view.h

Issue 380813003: Remove remaining overrides of View::HitTestRect() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: DoesIntersectRect() overrides made private Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" 9 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
10 #include "content/public/browser/notification_observer.h" 10 #include "content/public/browser/notification_observer.h"
11 #include "content/public/browser/notification_registrar.h" 11 #include "content/public/browser/notification_registrar.h"
12 #include "ui/views/controls/button/button.h" 12 #include "ui/views/controls/button/button.h"
13 #include "ui/views/window/non_client_view.h" 13 #include "ui/views/window/non_client_view.h"
14 14
15 class BrowserView; 15 class BrowserView;
16 16
17 class GlassBrowserFrameView : public BrowserNonClientFrameView, 17 class GlassBrowserFrameView : public BrowserNonClientFrameView,
18 public views::ButtonListener, 18 public views::ButtonListener,
19 public content::NotificationObserver { 19 public content::NotificationObserver {
20 public: 20 public:
21 // Constructs a non-client view for an BrowserFrame. 21 // Constructs a non-client view for an BrowserFrame.
22 GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view); 22 GlassBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
23 virtual ~GlassBrowserFrameView(); 23 virtual ~GlassBrowserFrameView();
24 24
25 // Overridden from BrowserNonClientFrameView: 25 // BrowserNonClientFrameView:
26 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE; 26 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE;
27 virtual int GetTopInset() const OVERRIDE; 27 virtual int GetTopInset() const OVERRIDE;
28 virtual int GetThemeBackgroundXInset() const OVERRIDE; 28 virtual int GetThemeBackgroundXInset() const OVERRIDE;
29 virtual void UpdateThrobber(bool running) OVERRIDE; 29 virtual void UpdateThrobber(bool running) OVERRIDE;
30 virtual gfx::Size GetMinimumSize() const OVERRIDE; 30 virtual gfx::Size GetMinimumSize() const OVERRIDE;
31 31
32 // Overridden from views::NonClientFrameView: 32 // views::NonClientFrameView:
33 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 33 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
34 virtual gfx::Rect GetWindowBoundsForClientBounds( 34 virtual gfx::Rect GetWindowBoundsForClientBounds(
35 const gfx::Rect& client_bounds) const OVERRIDE; 35 const gfx::Rect& client_bounds) const OVERRIDE;
36 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 36 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
37 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) 37 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
38 OVERRIDE {} 38 OVERRIDE {}
39 virtual void ResetWindowControls() OVERRIDE {} 39 virtual void ResetWindowControls() OVERRIDE {}
40 virtual void UpdateWindowIcon() OVERRIDE {} 40 virtual void UpdateWindowIcon() OVERRIDE {}
41 virtual void UpdateWindowTitle() OVERRIDE {} 41 virtual void UpdateWindowTitle() OVERRIDE {}
42 42
43 protected: 43 protected:
44 // Overridden from views::View: 44 // views::View:
45 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 45 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
46 virtual void Layout() OVERRIDE; 46 virtual void Layout() OVERRIDE;
47 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
48 47
49 // Overidden from views::ButtonListener: 48 // views::ButtonListener:
50 virtual void ButtonPressed(views::Button* sender, 49 virtual void ButtonPressed(views::Button* sender,
51 const ui::Event& event) OVERRIDE; 50 const ui::Event& event) OVERRIDE;
52 51
53 private: 52 private:
53 // views::NonClientFrameView:
54 virtual bool DoesIntersectRect(const views::View* target,
55 const gfx::Rect& rect) const OVERRIDE;
56
54 // Returns the thickness of the border that makes up the window frame edges. 57 // Returns the thickness of the border that makes up the window frame edges.
55 // This does not include any client edge. 58 // This does not include any client edge.
56 int FrameBorderThickness() const; 59 int FrameBorderThickness() const;
57 60
58 // Returns the thickness of the entire nonclient left, right, and bottom 61 // Returns the thickness of the entire nonclient left, right, and bottom
59 // borders, including both the window frame and any client edge. 62 // borders, including both the window frame and any client edge.
60 int NonClientBorderThickness() const; 63 int NonClientBorderThickness() const;
61 64
62 // Returns the height of the entire nonclient top border, including the window 65 // Returns the height of the entire nonclient top border, including the window
63 // frame, any title area, and any connected client edge. 66 // frame, any title area, and any connected client edge.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 content::NotificationRegistrar registrar_; 108 content::NotificationRegistrar registrar_;
106 109
107 static const int kThrobberIconCount = 24; 110 static const int kThrobberIconCount = 24;
108 static HICON throbber_icons_[kThrobberIconCount]; 111 static HICON throbber_icons_[kThrobberIconCount];
109 static void InitThrobberIcons(); 112 static void InitThrobberIcons();
110 113
111 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView); 114 DISALLOW_COPY_AND_ASSIGN(GlassBrowserFrameView);
112 }; 115 };
113 116
114 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ 117 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698