| 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_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 class VpnListForwarder; | 23 class VpnListForwarder; |
| 24 | 24 |
| 25 // Browser initialization for Ash. Only runs on Chrome OS. | 25 // Browser initialization for Ash. Only runs on Chrome OS. |
| 26 // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS. | 26 // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS. |
| 27 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { | 27 class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts { |
| 28 public: | 28 public: |
| 29 ChromeBrowserMainExtraPartsAsh(); | 29 ChromeBrowserMainExtraPartsAsh(); |
| 30 ~ChromeBrowserMainExtraPartsAsh() override; | 30 ~ChromeBrowserMainExtraPartsAsh() override; |
| 31 | 31 |
| 32 // Overridden from ChromeBrowserMainExtraParts: | 32 // Overridden from ChromeBrowserMainExtraParts: |
| 33 void ServiceManagerConnectionStarted( |
| 34 content::ServiceManagerConnection* connection) override; |
| 33 void PreProfileInit() override; | 35 void PreProfileInit() override; |
| 34 void PostProfileInit() override; | 36 void PostProfileInit() override; |
| 35 void PostMainMessageLoopRun() override; | 37 void PostMainMessageLoopRun() override; |
| 36 | 38 |
| 37 private: | 39 private: |
| 38 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_; | 40 std::unique_ptr<ChromeLauncherControllerMus> chrome_launcher_controller_mus_; |
| 39 std::unique_ptr<ChromeShellContentState> chrome_shell_content_state_; | 41 std::unique_ptr<ChromeShellContentState> chrome_shell_content_state_; |
| 40 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_; | 42 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_; |
| 41 std::unique_ptr<MediaClient> media_client_; | 43 std::unique_ptr<MediaClient> media_client_; |
| 42 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; | 44 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; |
| 43 std::unique_ptr<ImmersiveContextMus> immersive_context_; | 45 std::unique_ptr<ImmersiveContextMus> immersive_context_; |
| 44 std::unique_ptr<SessionControllerClient> session_controller_client_; | 46 std::unique_ptr<SessionControllerClient> session_controller_client_; |
| 45 std::unique_ptr<SystemTrayClient> system_tray_client_; | 47 std::unique_ptr<SystemTrayClient> system_tray_client_; |
| 46 std::unique_ptr<ChromeNewWindowClient> new_window_client_; | 48 std::unique_ptr<ChromeNewWindowClient> new_window_client_; |
| 47 std::unique_ptr<VolumeController> volume_controller_; | 49 std::unique_ptr<VolumeController> volume_controller_; |
| 48 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; | 50 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; |
| 49 | 51 |
| 50 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); | 52 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); |
| 51 }; | 53 }; |
| 52 | 54 |
| 53 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ | 55 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ |
| OLD | NEW |