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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 base::MakeUnique<ProxyResolutionServiceProvider>( | 247 base::MakeUnique<ProxyResolutionServiceProvider>( |
248 kLibCrosServiceInterface, kResolveNetworkProxy, | 248 kLibCrosServiceInterface, kResolveNetworkProxy, |
249 base::MakeUnique<ChromeProxyResolutionServiceProviderDelegate>())); | 249 base::MakeUnique<ChromeProxyResolutionServiceProviderDelegate>())); |
250 if (GetAshConfig() == ash::Config::CLASSIC) { | 250 if (GetAshConfig() == ash::Config::CLASSIC) { |
251 // TODO(crbug.com/629707): revisit this with mustash dbus work. | 251 // TODO(crbug.com/629707): revisit this with mustash dbus work. |
252 service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>( | 252 service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>( |
253 base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>())); | 253 base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>())); |
254 } | 254 } |
255 service_providers.push_back(base::MakeUnique<LivenessServiceProvider>()); | 255 service_providers.push_back(base::MakeUnique<LivenessServiceProvider>()); |
256 service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>()); | 256 service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>()); |
257 if (GetAshConfig() == ash::Config::CLASSIC) { | 257 // TODO(sky): once mash supports simplified display mode we should always |
| 258 // use ChromeConsoleServiceProviderDelegate. |
| 259 if (GetAshConfig() != ash::Config::MASH) { |
258 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( | 260 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( |
259 base::MakeUnique<ChromeConsoleServiceProviderDelegate>())); | 261 base::MakeUnique<ChromeConsoleServiceProviderDelegate>())); |
260 } else { | 262 } else { |
261 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( | 263 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( |
262 base::MakeUnique<MusConsoleServiceProviderDelegate>())); | 264 base::MakeUnique<MusConsoleServiceProviderDelegate>())); |
263 } | 265 } |
264 // TODO(teravest): Remove this provider once all callers are using | 266 // TODO(teravest): Remove this provider once all callers are using |
265 // |kiosk_info_service_| instead: http://crbug.com/703229 | 267 // |kiosk_info_service_| instead: http://crbug.com/703229 |
266 service_providers.push_back(base::MakeUnique<KioskInfoService>( | 268 service_providers.push_back(base::MakeUnique<KioskInfoService>( |
267 kLibCrosServiceInterface, | 269 kLibCrosServiceInterface, |
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
991 | 993 |
992 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 994 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
993 | 995 |
994 // Destroy DeviceSettingsService after g_browser_process. | 996 // Destroy DeviceSettingsService after g_browser_process. |
995 DeviceSettingsService::Shutdown(); | 997 DeviceSettingsService::Shutdown(); |
996 | 998 |
997 chromeos::ShutdownCloseTracking(); | 999 chromeos::ShutdownCloseTracking(); |
998 } | 1000 } |
999 | 1001 |
1000 } // namespace chromeos | 1002 } // namespace chromeos |
OLD | NEW |