Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2890293002: chromeos: Export GetKioskAppRequiredPlatformVersion method. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 if (GetAshConfig() != ash::Config::MASH) { 295 if (GetAshConfig() != ash::Config::MASH) {
296 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( 296 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
297 base::MakeUnique<ChromeConsoleServiceProviderDelegate>())); 297 base::MakeUnique<ChromeConsoleServiceProviderDelegate>()));
298 } else { 298 } else {
299 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( 299 service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
300 base::MakeUnique<MusConsoleServiceProviderDelegate>())); 300 base::MakeUnique<MusConsoleServiceProviderDelegate>()));
301 } 301 }
302 // TODO(teravest): Remove this provider once all callers are using 302 // TODO(teravest): Remove this provider once all callers are using
303 // |kiosk_info_service_| instead: http://crbug.com/703229 303 // |kiosk_info_service_| instead: http://crbug.com/703229
304 service_providers.push_back(base::MakeUnique<KioskInfoService>( 304 service_providers.push_back(base::MakeUnique<KioskInfoService>(
305 kLibCrosServiceInterface, 305 kLibCrosServiceInterface, kGetKioskAppRequiredPlatforVersion));
Daniel Erat 2017/05/19 00:08:38 yes, the constant is named "Platfor". ಠ_ಠ
306 kKioskAppServiceGetRequiredPlatformVersionMethod));
307 cros_dbus_service_ = CrosDBusService::Create( 306 cros_dbus_service_ = CrosDBusService::Create(
308 kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath), 307 kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath),
309 std::move(service_providers)); 308 std::move(service_providers));
310 309
311 proxy_resolution_service_ = CrosDBusService::Create( 310 proxy_resolution_service_ = CrosDBusService::Create(
312 kNetworkProxyServiceName, dbus::ObjectPath(kNetworkProxyServicePath), 311 kNetworkProxyServiceName, dbus::ObjectPath(kNetworkProxyServicePath),
313 CrosDBusService::CreateServiceProviderList( 312 CrosDBusService::CreateServiceProviderList(
314 base::MakeUnique<ProxyResolutionServiceProvider>( 313 base::MakeUnique<ProxyResolutionServiceProvider>(
315 kNetworkProxyServiceInterface, 314 kNetworkProxyServiceInterface,
316 kNetworkProxyServiceResolveProxyMethod, 315 kNetworkProxyServiceResolveProxyMethod,
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 1091
1093 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 1092 ChromeBrowserMainPartsLinux::PostDestroyThreads();
1094 1093
1095 // Destroy DeviceSettingsService after g_browser_process. 1094 // Destroy DeviceSettingsService after g_browser_process.
1096 DeviceSettingsService::Shutdown(); 1095 DeviceSettingsService::Shutdown();
1097 1096
1098 chromeos::ShutdownCloseTracking(); 1097 chromeos::ShutdownCloseTracking();
1099 } 1098 }
1100 1099
1101 } // namespace chromeos 1100 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698