| Index: chrome/browser/policy/profile_policy_connector.h
|
| diff --git a/chrome/browser/policy/profile_policy_connector.h b/chrome/browser/policy/profile_policy_connector.h
|
| index d7c4c26d9a5e4f68e0f9c5581f98ec0306fb7d1b..a20d1e24113df0839095d0b0a27c7842ff4d73e3 100644
|
| --- a/chrome/browser/policy/profile_policy_connector.h
|
| +++ b/chrome/browser/policy/profile_policy_connector.h
|
| @@ -15,10 +15,6 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include "chromeos/dbus/dbus_method_call_status.h"
|
| -#endif
|
| -
|
| class Profile;
|
|
|
| namespace net {
|
| @@ -30,8 +26,13 @@ class X509Certificate;
|
| typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
|
| }
|
|
|
| +namespace chromeos {
|
| +class User;
|
| +}
|
| +
|
| namespace policy {
|
|
|
| +class CloudPolicyManager;
|
| class ConfigurationPolicyProvider;
|
| class UserNetworkConfigurationUpdater;
|
| class PolicyService;
|
| @@ -45,7 +46,11 @@ class ProfilePolicyConnector : public BrowserContextKeyedService {
|
| virtual ~ProfilePolicyConnector();
|
|
|
| // If |force_immediate_load| then disk caches will be loaded synchronously.
|
| - void Init(bool force_immediate_load);
|
| + void Init(bool force_immediate_load,
|
| +#if defined(OS_CHROMEOS)
|
| + const chromeos::User* user,
|
| +#endif
|
| + CloudPolicyManager* user_cloud_policy_manager);
|
|
|
| void InitForTesting(scoped_ptr<PolicyService> service);
|
|
|
|
|