OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 26 matching lines...) Expand all Loading... |
37 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" | 37 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" |
38 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 38 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
39 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification
.h" | 39 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification
.h" |
40 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" | 40 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" |
41 #include "chrome/browser/chromeos/ash_config.h" | 41 #include "chrome/browser/chromeos/ash_config.h" |
42 #include "chrome/browser/chromeos/boot_times_recorder.h" | 42 #include "chrome/browser/chromeos/boot_times_recorder.h" |
43 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.
h" | 43 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.
h" |
44 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del
egate.h" | 44 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del
egate.h" |
45 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolution_service_provider_
delegate.h" | 45 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolution_service_provider_
delegate.h" |
46 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h" | 46 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h" |
47 #include "chrome/browser/chromeos/dbus/mus_console_service_provider_delegate.h" | |
48 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" | 47 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" |
49 #include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h" | 48 #include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h" |
50 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" | 49 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" |
51 #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h" | 50 #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h" |
52 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" | 51 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" |
53 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 52 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
54 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h" | 53 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h" |
55 #include "chrome/browser/chromeos/external_metrics.h" | 54 #include "chrome/browser/chromeos/external_metrics.h" |
56 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 55 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
57 #include "chrome/browser/chromeos/language_preferences.h" | 56 #include "chrome/browser/chromeos/language_preferences.h" |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 if (GetAshConfig() == ash::Config::CLASSIC) { | 287 if (GetAshConfig() == ash::Config::CLASSIC) { |
289 // TODO(crbug.com/629707): revisit this with mustash dbus work. | 288 // TODO(crbug.com/629707): revisit this with mustash dbus work. |
290 service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>( | 289 service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>( |
291 base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>())); | 290 base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>())); |
292 } | 291 } |
293 // TODO(teravest): Remove this provider once all callers are using | 292 // TODO(teravest): Remove this provider once all callers are using |
294 // |liveness_service_| instead: http://crbug.com/644322 | 293 // |liveness_service_| instead: http://crbug.com/644322 |
295 service_providers.push_back( | 294 service_providers.push_back( |
296 base::MakeUnique<LivenessServiceProvider>(kLibCrosServiceInterface)); | 295 base::MakeUnique<LivenessServiceProvider>(kLibCrosServiceInterface)); |
297 service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>()); | 296 service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>()); |
298 // TODO(sky): once mash supports simplified display mode we should always | 297 std::unique_ptr<ChromeConsoleServiceProviderDelegate> |
299 // use ChromeConsoleServiceProviderDelegate. | 298 console_service_provider_delegate = |
300 if (GetAshConfig() != ash::Config::MASH) { | 299 base::MakeUnique<ChromeConsoleServiceProviderDelegate>(); |
301 std::unique_ptr<ChromeConsoleServiceProviderDelegate> | 300 console_service_provider_delegate_ = |
302 console_service_provider_delegate = | 301 console_service_provider_delegate->AsWeakPtr(); |
303 base::MakeUnique<ChromeConsoleServiceProviderDelegate>(); | 302 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( |
304 console_service_provider_delegate_ = | 303 std::move(console_service_provider_delegate))); |
305 console_service_provider_delegate->AsWeakPtr(); | |
306 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( | |
307 std::move(console_service_provider_delegate))); | |
308 } else { | |
309 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( | |
310 base::MakeUnique<MusConsoleServiceProviderDelegate>())); | |
311 } | |
312 // TODO(teravest): Remove this provider once all callers are using | 304 // TODO(teravest): Remove this provider once all callers are using |
313 // |kiosk_info_service_| instead: http://crbug.com/703229 | 305 // |kiosk_info_service_| instead: http://crbug.com/703229 |
314 service_providers.push_back(base::MakeUnique<KioskInfoService>( | 306 service_providers.push_back(base::MakeUnique<KioskInfoService>( |
315 kLibCrosServiceInterface, kGetKioskAppRequiredPlatforVersion)); | 307 kLibCrosServiceInterface, kGetKioskAppRequiredPlatforVersion)); |
316 cros_dbus_service_ = CrosDBusService::Create( | 308 cros_dbus_service_ = CrosDBusService::Create( |
317 kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath), | 309 kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath), |
318 std::move(service_providers)); | 310 std::move(service_providers)); |
319 | 311 |
320 proxy_resolution_service_ = CrosDBusService::Create( | 312 proxy_resolution_service_ = CrosDBusService::Create( |
321 kNetworkProxyServiceName, dbus::ObjectPath(kNetworkProxyServicePath), | 313 kNetworkProxyServiceName, dbus::ObjectPath(kNetworkProxyServicePath), |
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1150 // outlive CertLoader. | 1142 // outlive CertLoader. |
1151 system_token_certdb_initializer_.reset(); | 1143 system_token_certdb_initializer_.reset(); |
1152 | 1144 |
1153 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 1145 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
1154 | 1146 |
1155 // Destroy DeviceSettingsService after g_browser_process. | 1147 // Destroy DeviceSettingsService after g_browser_process. |
1156 DeviceSettingsService::Shutdown(); | 1148 DeviceSettingsService::Shutdown(); |
1157 } | 1149 } |
1158 | 1150 |
1159 } // namespace chromeos | 1151 } // namespace chromeos |
OLD | NEW |