| 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 "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 | 138 |
| 139 // Used to show the system menu. Only used if | 139 // Used to show the system menu. Only used if |
| 140 // NativeBrowserFrame::UsesNativeSystemMenu() returns false. | 140 // NativeBrowserFrame::UsesNativeSystemMenu() returns false. |
| 141 scoped_ptr<views::MenuRunner> menu_runner_; | 141 scoped_ptr<views::MenuRunner> menu_runner_; |
| 142 | 142 |
| 143 // SetThemeProvider() triggers setting both |owned_theme_provider_| and | 143 // SetThemeProvider() triggers setting both |owned_theme_provider_| and |
| 144 // |theme_provider_|. Initially |theme_provider_| is set to the ThemeService | 144 // |theme_provider_|. Initially |theme_provider_| is set to the ThemeService |
| 145 // and |owned_theme_provider_| is null (as ThemeServices lifetime is managed | 145 // and |owned_theme_provider_| is null (as ThemeServices lifetime is managed |
| 146 // externally). | 146 // externally). |
| 147 scoped_ptr<ui::ThemeProvider> owned_theme_provider_; | 147 scoped_ptr<ui::ThemeProvider> owned_theme_provider_; |
| 148 ui::ThemeProvider* theme_provider_; | 148 const ui::ThemeProvider* theme_provider_; |
| 149 | 149 |
| 150 scoped_ptr<ui::EventHandler> browser_command_handler_; | 150 scoped_ptr<ui::EventHandler> browser_command_handler_; |
| 151 | 151 |
| 152 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); | 152 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); |
| 153 }; | 153 }; |
| 154 | 154 |
| 155 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ | 155 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ |
| OLD | NEW |