| 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_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 11 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
| 12 #include "ui/views/layout/layout_provider.h" | 12 #include "ui/views/layout/layout_provider.h" |
| 13 | 13 |
| 14 namespace ui { | 14 namespace ui { |
| 15 class InputDeviceClient; | 15 class InputDeviceClient; |
| 16 } | 16 } |
| 17 | 17 |
| 18 namespace views { | 18 namespace views { |
| 19 class ViewsDelegate; | 19 class ViewsDelegate; |
| 20 } | 20 } |
| 21 | 21 |
| 22 #if defined(USE_AURA) | 22 #if defined(USE_AURA) |
| 23 namespace ui_devtools { |
| 24 class UiDevToolsServer; |
| 25 } |
| 23 namespace views { | 26 namespace views { |
| 24 class MusClient; | 27 class MusClient; |
| 25 } | 28 } |
| 26 namespace wm { | 29 namespace wm { |
| 27 class WMState; | 30 class WMState; |
| 28 } | 31 } |
| 29 #endif | 32 #endif |
| 30 | 33 |
| 31 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { | 34 class ChromeBrowserMainExtraPartsViews : public ChromeBrowserMainExtraParts { |
| 32 public: | 35 public: |
| 33 ChromeBrowserMainExtraPartsViews(); | 36 ChromeBrowserMainExtraPartsViews(); |
| 34 ~ChromeBrowserMainExtraPartsViews() override; | 37 ~ChromeBrowserMainExtraPartsViews() override; |
| 35 | 38 |
| 36 // Overridden from ChromeBrowserMainExtraParts: | 39 // Overridden from ChromeBrowserMainExtraParts: |
| 37 void ToolkitInitialized() override; | 40 void ToolkitInitialized() override; |
| 38 void PreCreateThreads() override; | 41 void PreCreateThreads() override; |
| 39 void PreProfileInit() override; | 42 void PreProfileInit() override; |
| 40 void ServiceManagerConnectionStarted( | 43 void ServiceManagerConnectionStarted( |
| 41 content::ServiceManagerConnection* connection) override; | 44 content::ServiceManagerConnection* connection) override; |
| 42 | 45 |
| 43 private: | 46 private: |
| 44 std::unique_ptr<views::ViewsDelegate> views_delegate_; | 47 std::unique_ptr<views::ViewsDelegate> views_delegate_; |
| 45 std::unique_ptr<views::LayoutProvider> layout_provider_; | 48 std::unique_ptr<views::LayoutProvider> layout_provider_; |
| 46 | 49 |
| 47 #if defined(USE_AURA) | 50 #if defined(USE_AURA) |
| 51 // Only used when running in --enable-ui-devtools. |
| 52 std::unique_ptr<ui_devtools::UiDevToolsServer> devtools_server_; |
| 53 |
| 48 // Not created when running in ash::Config::MUS. | 54 // Not created when running in ash::Config::MUS. |
| 49 std::unique_ptr<wm::WMState> wm_state_; | 55 std::unique_ptr<wm::WMState> wm_state_; |
| 50 | 56 |
| 51 // Only used when running in ash::Config::MASH. | 57 // Only used when running in ash::Config::MASH. |
| 52 std::unique_ptr<views::MusClient> mus_client_; | 58 std::unique_ptr<views::MusClient> mus_client_; |
| 53 | 59 |
| 54 // Subscribes to updates about input-devices. | 60 // Subscribes to updates about input-devices. |
| 55 std::unique_ptr<ui::InputDeviceClient> input_device_client_; | 61 std::unique_ptr<ui::InputDeviceClient> input_device_client_; |
| 56 #endif | 62 #endif |
| 57 | 63 |
| 58 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); | 64 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsViews); |
| 59 }; | 65 }; |
| 60 | 66 |
| 61 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ | 67 #endif // CHROME_BROWSER_UI_VIEWS_CHROME_BROWSER_MAIN_EXTRA_PARTS_VIEWS_H_ |
| OLD | NEW |