Chromium Code Reviews| 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 8497e91d3d5535c876606d7efc97b0eaff5df67c..cac1f72f203ab0702b78fdfa5c8fd6bfe2beae32 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -66,7 +66,6 @@ |
| #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h" |
| #include "chrome/browser/chromeos/settings/device_settings_service.h" |
| -#include "chrome/browser/chromeos/settings/owner_key_util.h" |
| #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| #include "chrome/browser/chromeos/system/input_device_settings.h" |
| #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" |
| @@ -105,6 +104,7 @@ |
| #include "chromeos/system/statistics_provider.h" |
| #include "chromeos/tpm_token_loader.h" |
| #include "components/metrics/metrics_service.h" |
| +#include "components/ownership/owner_key_util.h" |
| #include "components/session_manager/core/session_manager.h" |
| #include "components/user_manager/user.h" |
| #include "components/user_manager/user_manager.h" |
| @@ -187,7 +187,7 @@ class DBusServices { |
| DeviceSettingsService::Initialize(); |
| DeviceSettingsService::Get()->SetSessionManager( |
| DBusThreadManager::Get()->GetSessionManagerClient(), |
| - OwnerKeyUtil::Create()); |
| + ownership::OwnerKeyUtil::Create()); |
|
erikwright (departed)
2014/08/25 15:51:06
This is the file where things should be configured
ygorshenin1
2014/08/26 14:53:35
Done.
|
| } |
| ~DBusServices() { |