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

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

Issue 10510006: Add ManagedModePolicyProvider and extension API to get and set policies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 6 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/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 82d1bc50a78db30f017bb4b425e4964883b48154..080c5c9afd050be75f371e9207bf2e287d8e862a 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -17,6 +17,8 @@
#include "chrome/browser/policy/cloud_policy_subsystem.h"
#include "chrome/browser/policy/configuration_policy_provider.h"
#include "chrome/browser/policy/device_management_service.h"
+#include "chrome/browser/policy/managed_mode_policy_provider.h"
+#include "chrome/browser/policy/managed_mode_policy_provider_factory.h"
#include "chrome/browser/policy/policy_service_impl.h"
#include "chrome/browser/policy/user_cloud_policy_manager.h"
#include "chrome/browser/policy/user_policy_cache.h"
@@ -171,6 +173,9 @@ PolicyService* BrowserPolicyConnector::CreatePolicyService(
if (profile) {
if (user_cloud_policy_manager_.get())
providers.push_back(user_cloud_policy_manager_.get());
+
+ providers.push_back(
+ ManagedModePolicyProviderFactory::GetForProfile(profile));
} else {
providers.push_back(&user_cloud_policy_provider_);
}
« no previous file with comments | « chrome/browser/extensions/extension_managed_mode_api.cc ('k') | chrome/browser/policy/managed_mode_policy_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698