Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5857)

Unified Diff: chrome/browser/policy/profile_policy_connector.h

Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix/Extend NetworkConfigurationUpdater unit test. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3c5392a63b142937e7a8fbd784961bdd057e4f7c..6c1844d274bc294f37c67fd20feaf374d8d6a4cd 100644
--- a/chrome/browser/policy/profile_policy_connector.h
+++ b/chrome/browser/policy/profile_policy_connector.h
@@ -8,18 +8,9 @@
#include <string>
#include "base/basictypes.h"
-#include "base/callback.h"
-#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
-class Profile;
-
-namespace net {
-class CertTrustAnchorProvider;
-}
-
namespace chromeos {
class User;
}
@@ -34,7 +25,7 @@ class PolicyService;
// components.
class ProfilePolicyConnector : public BrowserContextKeyedService {
public:
- explicit ProfilePolicyConnector(Profile* profile);
+ ProfilePolicyConnector();
virtual ~ProfilePolicyConnector();
// If |force_immediate_load| then disk caches will be loaded synchronously.
@@ -52,27 +43,10 @@ class ProfilePolicyConnector : public BrowserContextKeyedService {
// This is never NULL.
PolicyService* policy_service() const { return policy_service_.get(); }
-#if defined(OS_CHROMEOS)
- // Returns a callback that should be called if a policy installed certificate
- // was trusted for the associated profile. The closure can be safely used (on
- // the UI thread) even after this Connector is destructed.
- base::Closure GetPolicyCertTrustedCallback();
-#endif
-
- // Returns true if |profile()| has used certificates installed via policy
- // to establish a secure connection before. This means that it may have
- // cached content from an untrusted source.
- bool UsedPolicyCertificates();
-
private:
-#if defined(ENABLE_CONFIGURATION_POLICY)
-
-#if defined(OS_CHROMEOS)
- void SetUsedPolicyCertificatesOnce();
+#if defined(ENABLE_CONFIGURATION_POLICY) && defined(OS_CHROMEOS)
void InitializeDeviceLocalAccountPolicyProvider(const std::string& username);
-#endif
-#if defined(OS_CHROMEOS)
// Some of the user policy configuration affects browser global state, and
// can only come from one Profile. |is_primary_user_| is true if this
// connector belongs to the first signed-in Profile, and in that case that
@@ -81,14 +55,8 @@ class ProfilePolicyConnector : public BrowserContextKeyedService {
bool is_primary_user_;
scoped_ptr<ConfigurationPolicyProvider> special_user_policy_provider_;
-
- base::WeakPtrFactory<ProfilePolicyConnector> weak_ptr_factory_;
#endif
- Profile* profile_;
-
-#endif // ENABLE_CONFIGURATION_POLICY
-
scoped_ptr<PolicyService> policy_service_;
DISALLOW_COPY_AND_ASSIGN(ProfilePolicyConnector);

Powered by Google App Engine
This is Rietveld 408576698