Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
index 78643442b9f306694e2c3a90a533c4278c61b9f9..adee07314adbe50a855f2f31169e9c63b64bf94b 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -248,11 +248,20 @@ class DBusServices { |
service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>( |
base::MakeUnique<ChromeConsoleServiceProviderDelegate>())); |
} |
- service_providers.push_back(base::MakeUnique<KioskInfoService>()); |
+ service_providers.push_back(base::MakeUnique<KioskInfoService>( |
+ kLibCrosServiceInterface, |
+ kKioskAppServiceGetRequiredPlatformVersionMethod)); |
cros_dbus_service_ = CrosDBusService::Create( |
kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath), |
std::move(service_providers)); |
+ kiosk_info_service_ = CrosDBusService::Create( |
+ kKioskAppServiceName, dbus::ObjectPath(kKioskAppServicePath), |
+ CrosDBusService::CreateServiceProviderList( |
+ base::MakeUnique<KioskInfoService>( |
+ kKioskAppServiceInterface, |
+ kKioskAppServiceGetRequiredPlatformVersionMethod))); |
+ |
// Initialize PowerDataCollector after DBusThreadManager is initialized. |
PowerDataCollector::Initialize(); |
@@ -302,6 +311,7 @@ class DBusServices { |
CertLoader::Shutdown(); |
TPMTokenLoader::Shutdown(); |
cros_dbus_service_.reset(); |
+ kiosk_info_service_.reset(); |
PowerDataCollector::Shutdown(); |
PowerPolicyController::Shutdown(); |
device::BluetoothAdapterFactory::Shutdown(); |
@@ -319,6 +329,8 @@ class DBusServices { |
// split between different processes: http://crbug.com/692246 |
std::unique_ptr<CrosDBusService> cros_dbus_service_; |
+ std::unique_ptr<CrosDBusService> kiosk_info_service_; |
+ |
std::unique_ptr<NetworkConnectDelegateChromeOS> network_connect_delegate_; |
DISALLOW_COPY_AND_ASSIGN(DBusServices); |