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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 void OnMaximizeModeStarted() override; | 70 void OnMaximizeModeStarted() override; |
71 void OnMaximizeModeEnded() override; | 71 void OnMaximizeModeEnded() override; |
72 | 72 |
73 // chrome::TabIconViewModel: | 73 // chrome::TabIconViewModel: |
74 bool ShouldTabIconViewAnimate() const override; | 74 bool ShouldTabIconViewAnimate() const override; |
75 gfx::ImageSkia GetFaviconForTabIconView() override; | 75 gfx::ImageSkia GetFaviconForTabIconView() override; |
76 | 76 |
77 // views::ButtonListener: | 77 // views::ButtonListener: |
78 void ButtonPressed(views::Button* sender, const ui::Event& event) override; | 78 void ButtonPressed(views::Button* sender, const ui::Event& event) override; |
79 | 79 |
| 80 protected: |
| 81 // BrowserNonClientFrameView: |
| 82 void UpdateNewStyleAvatar() override; |
| 83 |
80 private: | 84 private: |
81 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, WindowHeader); | 85 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, WindowHeader); |
82 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, | 86 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, |
83 NonImmersiveFullscreen); | 87 NonImmersiveFullscreen); |
84 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, | 88 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, |
85 ImmersiveFullscreen); | 89 ImmersiveFullscreen); |
86 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, | 90 FRIEND_TEST_ALL_PREFIXES(BrowserNonClientFrameViewAshTest, |
87 ToggleMaximizeModeRelayout); | 91 ToggleMaximizeModeRelayout); |
88 FRIEND_TEST_ALL_PREFIXES(WebAppLeftHeaderViewTest, BackButton); | 92 FRIEND_TEST_ALL_PREFIXES(WebAppLeftHeaderViewTest, BackButton); |
89 FRIEND_TEST_ALL_PREFIXES(WebAppLeftHeaderViewTest, LocationIcon); | 93 FRIEND_TEST_ALL_PREFIXES(WebAppLeftHeaderViewTest, LocationIcon); |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 scoped_ptr<ash::HeaderPainter> header_painter_; | 150 scoped_ptr<ash::HeaderPainter> header_painter_; |
147 | 151 |
148 // Updates the hittest bounds overrides based on the window show type. | 152 // Updates the hittest bounds overrides based on the window show type. |
149 scoped_ptr<ash::FrameBorderHitTestController> | 153 scoped_ptr<ash::FrameBorderHitTestController> |
150 frame_border_hit_test_controller_; | 154 frame_border_hit_test_controller_; |
151 | 155 |
152 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); | 156 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); |
153 }; | 157 }; |
154 | 158 |
155 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 159 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
OLD | NEW |