| 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/prefs/pref_member.h" | 10 #include "base/prefs/pref_member.h" |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" | 12 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" |
| 13 #include "ui/views/context_menu_controller.h" | 13 #include "ui/views/context_menu_controller.h" |
| 14 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
| 15 | 15 |
| 16 class AvatarMenuButton; | 16 class AvatarMenuButton; |
| 17 class BrowserRootView; | 17 class BrowserRootView; |
| 18 class BrowserView; | 18 class BrowserView; |
| 19 class NativeBrowserFrame; | 19 class NativeBrowserFrame; |
| 20 class NewAvatarButton; | 20 class NewAvatarButton; |
| 21 class NonClientFrameView; | 21 class NonClientFrameView; |
| 22 class SystemMenuModelBuilder; | 22 class SystemMenuModelBuilder; |
| 23 | 23 |
| 24 namespace gfx { | 24 namespace gfx { |
| 25 class FontList; | 25 class FontList; |
| 26 class Rect; | 26 class Rect; |
| 27 } | 27 } |
| 28 | 28 |
| 29 namespace ui { | 29 namespace ui { |
| 30 class EventHandler; | |
| 31 class MenuModel; | 30 class MenuModel; |
| 32 class ThemeProvider; | 31 class ThemeProvider; |
| 33 } | 32 } |
| 34 | 33 |
| 35 namespace views { | 34 namespace views { |
| 36 class MenuRunner; | 35 class MenuRunner; |
| 37 class View; | 36 class View; |
| 38 } | 37 } |
| 39 | 38 |
| 40 // This is a virtual interface that allows system specific browser frames. | 39 // This is a virtual interface that allows system specific browser frames. |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 // SetThemeProvider() triggers setting both |owned_theme_provider_| and | 131 // SetThemeProvider() triggers setting both |owned_theme_provider_| and |
| 133 // |theme_provider_|. Initially |theme_provider_| is set to the ThemeService | 132 // |theme_provider_|. Initially |theme_provider_| is set to the ThemeService |
| 134 // and |owned_theme_provider_| is NULL (as ThemeServices lifetime is managed | 133 // and |owned_theme_provider_| is NULL (as ThemeServices lifetime is managed |
| 135 // externally). | 134 // externally). |
| 136 scoped_ptr<ui::ThemeProvider> owned_theme_provider_; | 135 scoped_ptr<ui::ThemeProvider> owned_theme_provider_; |
| 137 ui::ThemeProvider* theme_provider_; | 136 ui::ThemeProvider* theme_provider_; |
| 138 | 137 |
| 139 // Whether the custom Chrome frame preference is set. | 138 // Whether the custom Chrome frame preference is set. |
| 140 BooleanPrefMember use_custom_frame_pref_; | 139 BooleanPrefMember use_custom_frame_pref_; |
| 141 | 140 |
| 142 scoped_ptr<ui::EventHandler> browser_command_handler_; | |
| 143 | |
| 144 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); | 141 DISALLOW_COPY_AND_ASSIGN(BrowserFrame); |
| 145 }; | 142 }; |
| 146 | 143 |
| 147 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ | 144 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_H_ |
| OLD | NEW |