diff options
| author | Yuri Gorshenin <ygorshenin@chromium.org> | 2014-09-15 17:07:49 +0400 |
|---|---|---|
| committer | Yuri Gorshenin <ygorshenin@chromium.org> | 2014-09-15 13:13:21 +0000 |
| commit | c7bf410deedf2ee6be9439411ea362341c63bc43 (patch) | |
| tree | 3f571ced608eb51f35b031bf632db70a9cefbdbf /chrome/browser/profiles | |
| parent | cc5ee03cb5fe12f5ba3954961bd9963a5e83753c (diff) | |
| download | chromium_src-c7bf410deedf2ee6be9439411ea362341c63bc43.zip chromium_src-c7bf410deedf2ee6be9439411ea362341c63bc43.tar.gz chromium_src-c7bf410deedf2ee6be9439411ea362341c63bc43.tar.bz2 | |
Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*.
BUG=398856
TEST=existing browser_tests and unit_tests
R=erg@chromium.org, jochen@chromium.org, nkostylev@chromium.org, pastarmovj@chromium.org
Committed: https://chromium.googlesource.com/chromium/src/+/46a58bffbe303d3484d7cc288b47bfae5388109c
Committed: https://chromium.googlesource.com/chromium/src/+/40979bf265c3ffbe1736a87935418da72be5d1f1
Review URL: https://codereview.chromium.org/548323003
Cr-Commit-Position: refs/heads/master@{#294810}
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc index 06f1ebf..a31257b 100644 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc @@ -70,7 +70,7 @@ #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h" #include "chrome/browser/policy/schema_registry_service_factory.h" #if defined(OS_CHROMEOS) -#include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h" +#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h" #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h" #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h" @@ -221,7 +221,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() { policy::ProfilePolicyConnectorFactory::GetInstance(); #if defined(ENABLE_CONFIGURATION_POLICY) #if defined(OS_CHROMEOS) - chromeos::OwnerSettingsServiceFactory::GetInstance(); + chromeos::OwnerSettingsServiceChromeOSFactory::GetInstance(); policy::PolicyCertServiceFactory::GetInstance(); policy::RecommendationRestorerFactory::GetInstance(); policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance(); |