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

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

Issue 380813003: Remove remaining overrides of View::HitTestRect() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase against ToT 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_OPAQUE_BROWSER_FRAME_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/ui/view_ids.h" 9 #include "chrome/browser/ui/view_ids.h"
10 #include "chrome/browser/ui/views/frame/browser_frame.h" 10 #include "chrome/browser/ui/views/frame/browser_frame.h"
(...skipping 22 matching lines...) Expand all
33 public content::NotificationObserver, 33 public content::NotificationObserver,
34 public views::ButtonListener, 34 public views::ButtonListener,
35 public views::MenuButtonListener, 35 public views::MenuButtonListener,
36 public chrome::TabIconViewModel, 36 public chrome::TabIconViewModel,
37 public OpaqueBrowserFrameViewLayoutDelegate { 37 public OpaqueBrowserFrameViewLayoutDelegate {
38 public: 38 public:
39 // Constructs a non-client view for an BrowserFrame. 39 // Constructs a non-client view for an BrowserFrame.
40 OpaqueBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view); 40 OpaqueBrowserFrameView(BrowserFrame* frame, BrowserView* browser_view);
41 virtual ~OpaqueBrowserFrameView(); 41 virtual ~OpaqueBrowserFrameView();
42 42
43 // Overridden from BrowserNonClientFrameView: 43 // BrowserNonClientFrameView:
44 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE; 44 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE;
45 virtual int GetTopInset() const OVERRIDE; 45 virtual int GetTopInset() const OVERRIDE;
46 virtual int GetThemeBackgroundXInset() const OVERRIDE; 46 virtual int GetThemeBackgroundXInset() const OVERRIDE;
47 virtual void UpdateThrobber(bool running) OVERRIDE; 47 virtual void UpdateThrobber(bool running) OVERRIDE;
48 virtual gfx::Size GetMinimumSize() const OVERRIDE; 48 virtual gfx::Size GetMinimumSize() const OVERRIDE;
49 49
50 // Overridden from views::NonClientFrameView: 50 // views::NonClientFrameView:
51 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 51 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
52 virtual gfx::Rect GetWindowBoundsForClientBounds( 52 virtual gfx::Rect GetWindowBoundsForClientBounds(
53 const gfx::Rect& client_bounds) const OVERRIDE; 53 const gfx::Rect& client_bounds) const OVERRIDE;
54 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 54 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
55 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) 55 virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
56 OVERRIDE; 56 OVERRIDE;
57 virtual void ResetWindowControls() OVERRIDE; 57 virtual void ResetWindowControls() OVERRIDE;
58 virtual void UpdateWindowIcon() OVERRIDE; 58 virtual void UpdateWindowIcon() OVERRIDE;
59 virtual void UpdateWindowTitle() OVERRIDE; 59 virtual void UpdateWindowTitle() OVERRIDE;
60 virtual bool DoesIntersectRect(const views::View* target,
61 const gfx::Rect& rect) const OVERRIDE;
60 62
61 // Overridden from views::View: 63 // views::View:
62 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
63 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 64 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
64 65
65 // Overridden from views::ButtonListener: 66 // views::ButtonListener:
66 virtual void ButtonPressed(views::Button* sender, const ui::Event& event) 67 virtual void ButtonPressed(views::Button* sender, const ui::Event& event)
67 OVERRIDE; 68 OVERRIDE;
68 69
69 // Overridden from views::MenuButtonListener: 70 // views::MenuButtonListener:
70 virtual void OnMenuButtonClicked(views::View* source, const gfx::Point& point) 71 virtual void OnMenuButtonClicked(views::View* source, const gfx::Point& point)
71 OVERRIDE; 72 OVERRIDE;
72 73
73 // Overridden from chrome::TabIconViewModel: 74 // chrome::TabIconViewModel:
74 virtual bool ShouldTabIconViewAnimate() const OVERRIDE; 75 virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
75 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; 76 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
76 77
77 // content::NotificationObserver implementation: 78 // content::NotificationObserver implementation:
78 virtual void Observe(int type, 79 virtual void Observe(int type,
79 const content::NotificationSource& source, 80 const content::NotificationSource& source,
80 const content::NotificationDetails& details) OVERRIDE; 81 const content::NotificationDetails& details) OVERRIDE;
81 82
82 // OpaqueBrowserFrameViewLayoutDelegate implementation: 83 // OpaqueBrowserFrameViewLayoutDelegate implementation:
83 virtual bool ShouldShowWindowIcon() const OVERRIDE; 84 virtual bool ShouldShowWindowIcon() const OVERRIDE;
(...skipping 12 matching lines...) Expand all
96 virtual bool IsTabStripVisible() const OVERRIDE; 97 virtual bool IsTabStripVisible() const OVERRIDE;
97 virtual int GetTabStripHeight() const OVERRIDE; 98 virtual int GetTabStripHeight() const OVERRIDE;
98 virtual gfx::Size GetTabstripPreferredSize() const OVERRIDE; 99 virtual gfx::Size GetTabstripPreferredSize() const OVERRIDE;
99 100
100 protected: 101 protected:
101 views::ImageButton* minimize_button() const { return minimize_button_; } 102 views::ImageButton* minimize_button() const { return minimize_button_; }
102 views::ImageButton* maximize_button() const { return maximize_button_; } 103 views::ImageButton* maximize_button() const { return maximize_button_; }
103 views::ImageButton* restore_button() const { return restore_button_; } 104 views::ImageButton* restore_button() const { return restore_button_; }
104 views::ImageButton* close_button() const { return close_button_; } 105 views::ImageButton* close_button() const { return close_button_; }
105 106
106 // Overridden from views::View: 107 // views::View:
107 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 108 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
108 109
109 private: 110 private:
110 // Creates, adds and returns a new image button with |this| as its listener. 111 // Creates, adds and returns a new image button with |this| as its listener.
111 // Memory is owned by the caller. 112 // Memory is owned by the caller.
112 views::ImageButton* InitWindowCaptionButton(int normal_image_id, 113 views::ImageButton* InitWindowCaptionButton(int normal_image_id,
113 int hot_image_id, 114 int hot_image_id,
114 int pushed_image_id, 115 int pushed_image_id,
115 int mask_image_id, 116 int mask_image_id,
116 int accessibility_string_id, 117 int accessibility_string_id,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // Background painter for the window frame. 172 // Background painter for the window frame.
172 scoped_ptr<views::FrameBackground> frame_background_; 173 scoped_ptr<views::FrameBackground> frame_background_;
173 174
174 // Observer that handles platform dependent configuration. 175 // Observer that handles platform dependent configuration.
175 scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_; 176 scoped_ptr<OpaqueBrowserFrameViewPlatformSpecific> platform_observer_;
176 177
177 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView); 178 DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
178 }; 179 };
179 180
180 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_ 181 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698