OLD | NEW |
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 22 matching lines...) Expand all Loading... |
33 public views::ButtonListener { | 33 public views::ButtonListener { |
34 public: | 34 public: |
35 static const char kViewClassName[]; | 35 static const char kViewClassName[]; |
36 | 36 |
37 BrowserNonClientFrameViewAsh(BrowserFrame* frame, BrowserView* browser_view); | 37 BrowserNonClientFrameViewAsh(BrowserFrame* frame, BrowserView* browser_view); |
38 virtual ~BrowserNonClientFrameViewAsh(); | 38 virtual ~BrowserNonClientFrameViewAsh(); |
39 | 39 |
40 void Init(); | 40 void Init(); |
41 | 41 |
42 // BrowserNonClientFrameView: | 42 // BrowserNonClientFrameView: |
43 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE; | 43 virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const override; |
44 virtual int GetTopInset() const OVERRIDE; | 44 virtual int GetTopInset() const override; |
45 virtual int GetThemeBackgroundXInset() const OVERRIDE; | 45 virtual int GetThemeBackgroundXInset() const override; |
46 virtual void UpdateThrobber(bool running) OVERRIDE; | 46 virtual void UpdateThrobber(bool running) override; |
47 | 47 |
48 // views::NonClientFrameView: | 48 // views::NonClientFrameView: |
49 virtual gfx::Rect GetBoundsForClientView() const OVERRIDE; | 49 virtual gfx::Rect GetBoundsForClientView() const override; |
50 virtual gfx::Rect GetWindowBoundsForClientBounds( | 50 virtual gfx::Rect GetWindowBoundsForClientBounds( |
51 const gfx::Rect& client_bounds) const OVERRIDE; | 51 const gfx::Rect& client_bounds) const override; |
52 virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; | 52 virtual int NonClientHitTest(const gfx::Point& point) override; |
53 virtual void GetWindowMask(const gfx::Size& size, | 53 virtual void GetWindowMask(const gfx::Size& size, |
54 gfx::Path* window_mask) OVERRIDE; | 54 gfx::Path* window_mask) override; |
55 virtual void ResetWindowControls() OVERRIDE; | 55 virtual void ResetWindowControls() override; |
56 virtual void UpdateWindowIcon() OVERRIDE; | 56 virtual void UpdateWindowIcon() override; |
57 virtual void UpdateWindowTitle() OVERRIDE; | 57 virtual void UpdateWindowTitle() override; |
58 virtual void SizeConstraintsChanged() OVERRIDE; | 58 virtual void SizeConstraintsChanged() override; |
59 | 59 |
60 // views::View: | 60 // views::View: |
61 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; | 61 virtual void OnPaint(gfx::Canvas* canvas) override; |
62 virtual void Layout() OVERRIDE; | 62 virtual void Layout() override; |
63 virtual const char* GetClassName() const OVERRIDE; | 63 virtual const char* GetClassName() const override; |
64 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; | 64 virtual void GetAccessibleState(ui::AXViewState* state) override; |
65 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 65 virtual gfx::Size GetMinimumSize() const override; |
66 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; | 66 virtual void ChildPreferredSizeChanged(views::View* child) override; |
67 | 67 |
68 // ash::ShellObserver: | 68 // ash::ShellObserver: |
69 virtual void OnMaximizeModeStarted() OVERRIDE; | 69 virtual void OnMaximizeModeStarted() override; |
70 virtual void OnMaximizeModeEnded() OVERRIDE; | 70 virtual void OnMaximizeModeEnded() override; |
71 | 71 |
72 // chrome::TabIconViewModel: | 72 // chrome::TabIconViewModel: |
73 virtual bool ShouldTabIconViewAnimate() const OVERRIDE; | 73 virtual bool ShouldTabIconViewAnimate() const override; |
74 virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE; | 74 virtual gfx::ImageSkia GetFaviconForTabIconView() override; |
75 | 75 |
76 // CommandObserver: | 76 // CommandObserver: |
77 virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE; | 77 virtual void EnabledStateChangedForCommand(int id, bool enabled) override; |
78 | 78 |
79 // views::ButtonListener: | 79 // views::ButtonListener: |
80 virtual void ButtonPressed(views::Button* sender, | 80 virtual void ButtonPressed(views::Button* sender, |
81 const ui::Event& event) OVERRIDE; | 81 const ui::Event& event) override; |
82 | 82 |
83 private: | 83 private: |
84 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, WindowHeader); | 84 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, WindowHeader); |
85 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, | 85 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, |
86 NonImmersiveFullscreen); | 86 NonImmersiveFullscreen); |
87 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, | 87 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, |
88 ImmersiveFullscreen); | 88 ImmersiveFullscreen); |
89 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, | 89 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, |
90 ToggleMaximizeModeRelayout); | 90 ToggleMaximizeModeRelayout); |
91 | 91 |
92 // views::NonClientFrameView: | 92 // views::NonClientFrameView: |
93 virtual bool DoesIntersectRect(const views::View* target, | 93 virtual bool DoesIntersectRect(const views::View* target, |
94 const gfx::Rect& rect) const OVERRIDE; | 94 const gfx::Rect& rect) const override; |
95 | 95 |
96 // Distance between the left edge of the NonClientFrameView and the tab strip. | 96 // Distance between the left edge of the NonClientFrameView and the tab strip. |
97 int GetTabStripLeftInset() const; | 97 int GetTabStripLeftInset() const; |
98 | 98 |
99 // Distance between the right edge of the NonClientFrameView and the tab | 99 // Distance between the right edge of the NonClientFrameView and the tab |
100 // strip. | 100 // strip. |
101 int GetTabStripRightInset() const; | 101 int GetTabStripRightInset() const; |
102 | 102 |
103 // Returns true if we should use a super short header with light bars instead | 103 // Returns true if we should use a super short header with light bars instead |
104 // of regular tabs. This header is used in immersive fullscreen when the | 104 // of regular tabs. This header is used in immersive fullscreen when the |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 scoped_ptr<ash::HeaderPainter> header_painter_; | 148 scoped_ptr<ash::HeaderPainter> header_painter_; |
149 | 149 |
150 // Updates the hittest bounds overrides based on the window show type. | 150 // Updates the hittest bounds overrides based on the window show type. |
151 scoped_ptr<ash::FrameBorderHitTestController> | 151 scoped_ptr<ash::FrameBorderHitTestController> |
152 frame_border_hit_test_controller_; | 152 frame_border_hit_test_controller_; |
153 | 153 |
154 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); | 154 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); |
155 }; | 155 }; |
156 | 156 |
157 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 157 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
OLD | NEW |