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_FRAME_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 // copy as a BrowserRootView to avoid evil casting later, when we need to call | 125 // copy as a BrowserRootView to avoid evil casting later, when we need to call |
126 // functions that only exist on BrowserRootView (versus RootView). | 126 // functions that only exist on BrowserRootView (versus RootView). |
127 BrowserRootView* root_view_; | 127 BrowserRootView* root_view_; |
128 | 128 |
129 // A pointer to our NonClientFrameView as a BrowserNonClientFrameView. | 129 // A pointer to our NonClientFrameView as a BrowserNonClientFrameView. |
130 BrowserNonClientFrameView* browser_frame_view_; | 130 BrowserNonClientFrameView* browser_frame_view_; |
131 | 131 |
132 // The BrowserView is our ClientView. This is a pointer to it. | 132 // The BrowserView is our ClientView. This is a pointer to it. |
133 BrowserView* browser_view_; | 133 BrowserView* browser_view_; |
134 | 134 |
135 scoped_ptr<SystemMenuModelBuilder> menu_model_builder_; | 135 std::unique_ptr<SystemMenuModelBuilder> menu_model_builder_; |
136 | 136 |
137 // Used to show the system menu. Only used if | 137 // Used to show the system menu. Only used if |
138 // NativeBrowserFrame::UsesNativeSystemMenu() returns false. | 138 // NativeBrowserFrame::UsesNativeSystemMenu() returns false. |
139 scoped_ptr<views::MenuRunner> menu_runner_; | 139 std::unique_ptr<views::MenuRunner> menu_runner_; |
140 | 140 |
141 const ThemeService* theme_service_; | 141 const ThemeService* theme_service_; |
142 | 142 |
143 scoped_ptr<ui::EventHandler> browser_command_handler_; | 143 std::unique_ptr<ui::EventHandler> browser_command_handler_; |
144 | 144 |
145 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); | 145 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); |
146 }; | 146 }; |
147 | 147 |
148 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ | 148 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ |
OLD | NEW |