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 <memory> |
| 9 |
8 #include "ash/shell_observer.h" | 10 #include "ash/shell_observer.h" |
9 #include "base/gtest_prod_util.h" | 11 #include "base/gtest_prod_util.h" |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" | 13 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" |
13 #include "chrome/browser/ui/views/tab_icon_view_model.h" | 14 #include "chrome/browser/ui/views/tab_icon_view_model.h" |
14 | 15 |
15 class TabIconView; | 16 class TabIconView; |
16 class WebAppLeftHeaderView; | 17 class WebAppLeftHeaderView; |
17 | 18 |
18 namespace ash { | 19 namespace ash { |
19 class FrameBorderHitTestController; | 20 class FrameBorderHitTestController; |
20 class FrameCaptionButton; | 21 class FrameCaptionButton; |
21 class FrameCaptionButtonContainerView; | 22 class FrameCaptionButtonContainerView; |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 ash::FrameCaptionButtonContainerView* caption_button_container_; | 127 ash::FrameCaptionButtonContainerView* caption_button_container_; |
127 | 128 |
128 // The holder for the buttons on the left side of the header. This is included | 129 // The holder for the buttons on the left side of the header. This is included |
129 // for web app style frames, and includes a back button and location icon. | 130 // for web app style frames, and includes a back button and location icon. |
130 WebAppLeftHeaderView* web_app_left_header_view_; | 131 WebAppLeftHeaderView* web_app_left_header_view_; |
131 | 132 |
132 // For popups, the window icon. | 133 // For popups, the window icon. |
133 TabIconView* window_icon_; | 134 TabIconView* window_icon_; |
134 | 135 |
135 // Helper class for painting the header. | 136 // Helper class for painting the header. |
136 scoped_ptr<ash::HeaderPainter> header_painter_; | 137 std::unique_ptr<ash::HeaderPainter> header_painter_; |
137 | 138 |
138 // Updates the hittest bounds overrides based on the window show type. | 139 // Updates the hittest bounds overrides based on the window show type. |
139 scoped_ptr<ash::FrameBorderHitTestController> | 140 std::unique_ptr<ash::FrameBorderHitTestController> |
140 frame_border_hit_test_controller_; | 141 frame_border_hit_test_controller_; |
141 | 142 |
142 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); | 143 DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh); |
143 }; | 144 }; |
144 | 145 |
145 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ | 146 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_ |
OLD | NEW |