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 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" | 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h" |
6 | 6 |
7 #include "ash/public/cpp/mus_property_mirror_ash.h" | 7 #include "ash/public/cpp/mus_property_mirror_ash.h" |
8 #include "ash/public/cpp/window_pin_type.h" | 8 #include "ash/public/cpp/window_pin_type.h" |
9 #include "ash/public/cpp/window_properties.h" | 9 #include "ash/public/cpp/window_properties.h" |
10 #include "ash/public/interfaces/window_pin_type.mojom.h" | 10 #include "ash/public/interfaces/window_pin_type.mojom.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { | 68 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
69 if (ash_util::ShouldOpenAshOnStartup()) | 69 if (ash_util::ShouldOpenAshOnStartup()) |
70 ash_init_ = base::MakeUnique<AshInit>(); | 70 ash_init_ = base::MakeUnique<AshInit>(); |
71 | 71 |
72 if (ash_util::IsRunningInMash()) { | 72 if (ash_util::IsRunningInMash()) { |
73 immersive_context_ = base::MakeUnique<ImmersiveContextMus>(); | 73 immersive_context_ = base::MakeUnique<ImmersiveContextMus>(); |
74 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); | 74 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); |
75 } | 75 } |
76 | 76 |
77 session_controller_client_ = base::MakeUnique<SessionControllerClient>(); | 77 session_controller_client_ = base::MakeUnique<SessionControllerClient>(); |
| 78 session_controller_client_->Init(); |
78 | 79 |
79 // Must be available at login screen, so initialize before profile. | 80 // Must be available at login screen, so initialize before profile. |
80 system_tray_client_ = base::MakeUnique<SystemTrayClient>(); | 81 system_tray_client_ = base::MakeUnique<SystemTrayClient>(); |
81 new_window_client_ = base::MakeUnique<ChromeNewWindowClient>(); | 82 new_window_client_ = base::MakeUnique<ChromeNewWindowClient>(); |
82 volume_controller_ = base::MakeUnique<VolumeController>(); | 83 volume_controller_ = base::MakeUnique<VolumeController>(); |
83 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>(); | 84 vpn_list_forwarder_ = base::MakeUnique<VpnListForwarder>(); |
84 | 85 |
85 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile | 86 // For OS_CHROMEOS, virtual keyboard needs to be initialized before profile |
86 // initialized. Otherwise, virtual keyboard extension will not load at login | 87 // initialized. Otherwise, virtual keyboard extension will not load at login |
87 // screen. | 88 // screen. |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 vpn_list_forwarder_.reset(); | 120 vpn_list_forwarder_.reset(); |
120 volume_controller_.reset(); | 121 volume_controller_.reset(); |
121 new_window_client_.reset(); | 122 new_window_client_.reset(); |
122 system_tray_client_.reset(); | 123 system_tray_client_.reset(); |
123 media_client_.reset(); | 124 media_client_.reset(); |
124 cast_config_client_media_router_.reset(); | 125 cast_config_client_media_router_.reset(); |
125 session_controller_client_.reset(); | 126 session_controller_client_.reset(); |
126 | 127 |
127 ash_init_.reset(); | 128 ash_init_.reset(); |
128 } | 129 } |
OLD | NEW |