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

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

Issue 23376002: Move ManagedModePolicyProvider functionality to ManagedUserSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 3 months 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.cc
diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc
index 311d7432ff6fb819ae3e2f776c9a3e64fb590833..76826be1b2e3a1687b20bdace851b321fbc52e99 100644
--- a/chrome/browser/policy/profile_policy_connector.cc
+++ b/chrome/browser/policy/profile_policy_connector.cc
@@ -12,10 +12,6 @@
#include "chrome/browser/policy/configuration_policy_provider.h"
#include "chrome/browser/policy/policy_service_impl.h"
-#if defined(ENABLE_MANAGED_USERS)
-#include "chrome/browser/policy/managed_mode_policy_provider.h"
-#endif
-
#if defined(OS_CHROMEOS)
#include "base/bind.h"
#include "base/prefs/pref_service.h"
@@ -97,13 +93,6 @@ void ProfilePolicyConnector::Init(
providers.push_back(cloud_policy_manager);
#endif
-#if defined(ENABLE_MANAGED_USERS)
- managed_mode_policy_provider_ = ManagedModePolicyProvider::Create(
- profile_, sequenced_task_runner, force_immediate_load);
- managed_mode_policy_provider_->Init();
- providers.push_back(managed_mode_policy_provider_.get());
-#endif
-
policy_service_ = connector->CreatePolicyService(providers);
#if defined(OS_CHROMEOS)
@@ -140,11 +129,6 @@ void ProfilePolicyConnector::Shutdown() {
if (special_user_policy_provider_)
special_user_policy_provider_->Shutdown();
#endif
-
-#if defined(ENABLE_MANAGED_USERS)
- if (managed_mode_policy_provider_)
- managed_mode_policy_provider_->Shutdown();
-#endif
}
#if defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698