| Index: chrome/browser/profiles/profile_impl.h
|
| diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
|
| index ed3918e3a3de5d58e2518f461b8baf5a8253779d..1e0096ab0d559ab4cc64213e267181403adcb0d6 100644
|
| --- a/chrome/browser/profiles/profile_impl.h
|
| +++ b/chrome/browser/profiles/profile_impl.h
|
| @@ -46,6 +46,10 @@ namespace extensions {
|
| class ExtensionSystem;
|
| }
|
|
|
| +namespace policy {
|
| +class UserCloudPolicyManager;
|
| +}
|
| +
|
| // The default profile implementation.
|
| class ProfileImpl : public Profile,
|
| public content::NotificationObserver {
|
| @@ -95,7 +99,6 @@ class ProfileImpl : public Profile,
|
| virtual ExtensionSpecialStoragePolicy*
|
| GetExtensionSpecialStoragePolicy() OVERRIDE;
|
| virtual GAIAInfoUpdateService* GetGAIAInfoUpdateService() OVERRIDE;
|
| - virtual policy::UserCloudPolicyManager* GetUserCloudPolicyManager() OVERRIDE;
|
| virtual policy::ManagedModePolicyProvider*
|
| GetManagedModePolicyProvider() OVERRIDE;
|
| virtual policy::PolicyService* GetPolicyService() OVERRIDE;
|
| @@ -207,8 +210,10 @@ class ProfileImpl : public Profile,
|
| // |prefs_| depends on |policy_service_|, which depends on
|
| // |user_cloud_policy_manager_| and |managed_mode_policy_provider_|.
|
| // TODO(bauerb, mnissler): Once |prefs_| is a ProfileKeyedService, these
|
| - // should become ProfileKeyedServices as well.
|
| + // should become proper ProfileKeyedServices as well.
|
| +#if !defined(OS_CHROMEOS)
|
| scoped_ptr<policy::UserCloudPolicyManager> cloud_policy_manager_;
|
| +#endif
|
| scoped_ptr<policy::ManagedModePolicyProvider> managed_mode_policy_provider_;
|
| #endif
|
| scoped_ptr<policy::PolicyService> policy_service_;
|
|
|