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

Unified Diff: chrome/browser/ui/webui/policy_ui.cc

Issue 10386097: Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 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
« no previous file with comments | « chrome/browser/prefs/proxy_policy_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/policy_ui.cc
diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc
index 91e3f48e2d548389e0b036bca1d0f92dd713d7d7..425204a6913cf289c8657e796e616ea36ee689a0 100644
--- a/chrome/browser/ui/webui/policy_ui.cc
+++ b/chrome/browser/ui/webui/policy_ui.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ui/webui/policy_ui.h"
+#include <vector>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/hash_tables.h"
@@ -192,15 +194,11 @@ void PolicyUIHandler::OnRefreshDone() {
void PolicyUIHandler::SendDataToUI() {
policy::PolicyService* service = g_browser_process->policy_service();
- const policy::PolicyMap* policies =
- service->GetPolicies(policy::POLICY_DOMAIN_CHROME, "");
bool any_policies_set = false;
- base::ListValue* list;
- if (policies)
- list = GetPolicyStatusList(*policies, &any_policies_set).release();
- else
- list = new base::ListValue();
-
+ base::ListValue* list =
+ GetPolicyStatusList(
+ service->GetPolicies(policy::POLICY_DOMAIN_CHROME, std::string()),
+ &any_policies_set).release();
base::DictionaryValue results;
results.Set("policies", list);
results.SetBoolean("anyPoliciesSet", any_policies_set);
« no previous file with comments | « chrome/browser/prefs/proxy_policy_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698