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

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

Issue 6979011: Move user cloud policy to BrowserProcess. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments by mnissler. Added unittest. Created 9 years, 7 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/user_policy_cache.cc
diff --git a/chrome/browser/policy/user_policy_cache.cc b/chrome/browser/policy/user_policy_cache.cc
index 6d0a53edb90d11437ca986ddc402764237ae56ce..418c34f8a43ff71f1317b9036ec32a3d5b8e8baa 100644
--- a/chrome/browser/policy/user_policy_cache.cc
+++ b/chrome/browser/policy/user_policy_cache.cc
@@ -12,6 +12,9 @@
#include "base/logging.h"
#include "base/task.h"
#include "base/values.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/cloud_policy_provider.h"
+#include "chrome/browser/policy/user_policy_connector.h"
Joao da Silva 2011/05/31 14:50:23 Alphabetic order.
sfeuz 2011/06/03 08:30:35 Done.
#include "chrome/browser/policy/configuration_policy_pref_store.h"
#include "chrome/browser/policy/policy_map.h"
#include "chrome/browser/policy/proto/cloud_policy.pb.h"
@@ -264,7 +267,8 @@ void UserPolicyCache::MaybeDecodeOldstylePolicy(
// Hack: Let one of the providers do the transformation from DictionaryValue
// to PolicyMap, since they have the required code anyway.
PolicyMapProxy map_proxy(mandatory);
- GetManagedPolicyProvider()->ApplyPolicyValueTree(&result, &map_proxy);
+ g_browser_process->user_policy_connector()->GetManagedCloudProvider()->
+ ApplyPolicyValueTree(&result, &map_proxy);
}
Value* UserPolicyCache::DecodeIntegerValue(

Powered by Google App Engine
This is Rietveld 408576698