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

Side by Side Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
7 7
8 #include "ash/shell_observer.h" 8 #include "ash/shell_observer.h"
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 17 matching lines...) Expand all
28 public ash::ShellObserver, 28 public ash::ShellObserver,
29 public chrome::TabIconViewModel { 29 public chrome::TabIconViewModel {
30 public: 30 public:
31 static const char kViewClassName[]; 31 static const char kViewClassName[];
32 32
33 BrowserNonClientFrameViewAsh(BrowserFrame* frame, BrowserView* browser_view); 33 BrowserNonClientFrameViewAsh(BrowserFrame* frame, BrowserView* browser_view);
34 virtual ~BrowserNonClientFrameViewAsh(); 34 virtual ~BrowserNonClientFrameViewAsh();
35 35
36 void Init(); 36 void Init();
37 37
38 // BrowserNonClientFrameView overrides: 38 // BrowserNonClientFrameView:
39 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE; 39 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE;
40 virtual int GetTopInset() const OVERRIDE; 40 virtual int GetTopInset() const OVERRIDE;
41 virtual int GetThemeBackgroundXInset() const OVERRIDE; 41 virtual int GetThemeBackgroundXInset() const OVERRIDE;
42 virtual void UpdateThrobber(bool running) OVERRIDE; 42 virtual void UpdateThrobber(bool running) OVERRIDE;
43 43
44 // views::NonClientFrameView overrides: 44 // views::NonClientFrameView:
45 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; 45 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
46 virtual gfx::Rect GetWindowBoundsForClientBounds( 46 virtual gfx::Rect GetWindowBoundsForClientBounds(
47 const gfx::Rect& client_bounds) const OVERRIDE; 47 const gfx::Rect& client_bounds) const OVERRIDE;
48 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; 48 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
49 virtual void GetWindowMask(const gfx::Size& size, 49 virtual void GetWindowMask(const gfx::Size& size,
50 gfx::Path* window_mask) OVERRIDE; 50 gfx::Path* window_mask) OVERRIDE;
51 virtual void ResetWindowControls() OVERRIDE; 51 virtual void ResetWindowControls() OVERRIDE;
52 virtual void UpdateWindowIcon() OVERRIDE; 52 virtual void UpdateWindowIcon() OVERRIDE;
53 virtual void UpdateWindowTitle() OVERRIDE; 53 virtual void UpdateWindowTitle() OVERRIDE;
54 54
55 // views::View overrides: 55 // views::View:
56 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 56 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
57 virtual void Layout() OVERRIDE; 57 virtual void Layout() OVERRIDE;
58 virtual const char* GetClassName() const OVERRIDE; 58 virtual const char* GetClassName() const OVERRIDE;
59 virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
60 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 59 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
61 virtual gfx::Size GetMinimumSize() const OVERRIDE; 60 virtual gfx::Size GetMinimumSize() const OVERRIDE;
62 61
63 // ash::ShellObserver: 62 // ash::ShellObserver:
64 virtual void OnMaximizeModeStarted() OVERRIDE; 63 virtual void OnMaximizeModeStarted() OVERRIDE;
65 virtual void OnMaximizeModeEnded() OVERRIDE; 64 virtual void OnMaximizeModeEnded() OVERRIDE;
66 65
67 // Overridden from chrome::TabIconViewModel: 66 // chrome::TabIconViewModel:
68 virtual bool ShouldTabIconViewAnimate() const OVERRIDE; 67 virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
69 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; 68 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
70 69
71 private: 70 private:
72 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, WindowHeader); 71 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, WindowHeader);
73 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, 72 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest,
74 NonImmersiveFullscreen); 73 NonImmersiveFullscreen);
75 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, 74 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest,
76 ImmersiveFullscreen); 75 ImmersiveFullscreen);
77 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, 76 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest,
78 ToggleMaximizeModeRelayout); 77 ToggleMaximizeModeRelayout);
79 78
79 // views::NonClientFrameView:
80 virtual bool DoesIntersectRect(const views::View* target,
81 const gfx::Rect& rect) const OVERRIDE;
82
80 // Distance between the left edge of the NonClientFrameView and the tab strip. 83 // Distance between the left edge of the NonClientFrameView and the tab strip.
81 int GetTabStripLeftInset() const; 84 int GetTabStripLeftInset() const;
82 85
83 // Distance between the right edge of the NonClientFrameView and the tab 86 // Distance between the right edge of the NonClientFrameView and the tab
84 // strip. 87 // strip.
85 int GetTabStripRightInset() const; 88 int GetTabStripRightInset() const;
86 89
87 // Returns true if we should use a super short header with light bars instead 90 // Returns true if we should use a super short header with light bars instead
88 // of regular tabs. This header is used in immersive fullscreen when the 91 // of regular tabs. This header is used in immersive fullscreen when the
89 // top-of-window views are not revealed. 92 // top-of-window views are not revealed.
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 scoped_ptr<ash::HeaderPainter> header_painter_; 124 scoped_ptr<ash::HeaderPainter> header_painter_;
122 125
123 // Updates the hittest bounds overrides based on the window show type. 126 // Updates the hittest bounds overrides based on the window show type.
124 scoped_ptr<ash::FrameBorderHitTestController> 127 scoped_ptr<ash::FrameBorderHitTestController>
125 frame_border_hit_test_controller_; 128 frame_border_hit_test_controller_;
126 129
127 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); 130 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
128 }; 131 };
129 132
130 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ 133 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
OLDNEW
« no previous file with comments | « ash/frame/custom_frame_view_ash.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698