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" |
11 #include "chrome/browser/chrome_browser_main_extra_parts.h" | 11 #include "chrome/browser/chrome_browser_main_extra_parts.h" |
12 | 12 |
13 namespace ash { | 13 namespace ash { |
14 class ShelfModel; | 14 class ShelfModel; |
15 } | 15 } |
16 | 16 |
17 class AshInit; | 17 class AshInit; |
18 class CastConfigClientMediaRouter; | 18 class CastConfigClientMediaRouter; |
19 class ChromeLauncherController; | 19 class ChromeLauncherController; |
20 class ChromeNewWindowClient; | 20 class ChromeNewWindowClient; |
21 class ChromeShellContentState; | 21 class ChromeShellContentState; |
| 22 class LockScreenClientChromeOS; |
22 class ImmersiveContextMus; | 23 class ImmersiveContextMus; |
23 class ImmersiveHandlerFactoryMus; | 24 class ImmersiveHandlerFactoryMus; |
24 class MediaClient; | 25 class MediaClient; |
25 class SessionControllerClient; | 26 class SessionControllerClient; |
26 class SystemTrayClient; | 27 class SystemTrayClient; |
27 class VolumeController; | 28 class VolumeController; |
28 class VpnListForwarder; | 29 class VpnListForwarder; |
29 | 30 |
30 // Browser initialization for Ash. Only runs on Chrome OS. | 31 // Browser initialization for Ash. Only runs on Chrome OS. |
31 // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS. | 32 // TODO(jamescook): Fold this into ChromeBrowserMainPartsChromeOS. |
(...skipping 14 matching lines...) Expand all Loading... |
46 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_; | 47 std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_; |
47 std::unique_ptr<MediaClient> media_client_; | 48 std::unique_ptr<MediaClient> media_client_; |
48 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; | 49 std::unique_ptr<ImmersiveHandlerFactoryMus> immersive_handler_factory_; |
49 std::unique_ptr<ImmersiveContextMus> immersive_context_; | 50 std::unique_ptr<ImmersiveContextMus> immersive_context_; |
50 std::unique_ptr<SessionControllerClient> session_controller_client_; | 51 std::unique_ptr<SessionControllerClient> session_controller_client_; |
51 std::unique_ptr<SystemTrayClient> system_tray_client_; | 52 std::unique_ptr<SystemTrayClient> system_tray_client_; |
52 std::unique_ptr<ChromeNewWindowClient> new_window_client_; | 53 std::unique_ptr<ChromeNewWindowClient> new_window_client_; |
53 std::unique_ptr<VolumeController> volume_controller_; | 54 std::unique_ptr<VolumeController> volume_controller_; |
54 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; | 55 std::unique_ptr<VpnListForwarder> vpn_list_forwarder_; |
55 std::unique_ptr<AshInit> ash_init_; | 56 std::unique_ptr<AshInit> ash_init_; |
| 57 std::unique_ptr<LockScreenClientChromeOS> lock_screen_client_; |
56 | 58 |
57 // These are only used in Mash; corresponding instances are owned by Ash's | 59 // These are only used in Mash; corresponding instances are owned by Ash's |
58 // ShelfController and ChromeShellDelegate in classic Ash. | 60 // ShelfController and ChromeShellDelegate in classic Ash. |
59 std::unique_ptr<ash::ShelfModel> chrome_shelf_model_; | 61 std::unique_ptr<ash::ShelfModel> chrome_shelf_model_; |
60 std::unique_ptr<ChromeLauncherController> chrome_launcher_controller_; | 62 std::unique_ptr<ChromeLauncherController> chrome_launcher_controller_; |
61 | 63 |
62 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); | 64 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsAsh); |
63 }; | 65 }; |
64 | 66 |
65 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ | 67 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_BROWSER_MAIN_EXTRA_PARTS_ASH_H_ |
OLD | NEW |