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

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

Issue 10384145: Removed ConfigurationPolicyProvider::Provide(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased 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
Index: chrome/browser/policy/configuration_policy_provider_delegate_win.cc
diff --git a/chrome/browser/policy/configuration_policy_provider_delegate_win.cc b/chrome/browser/policy/configuration_policy_provider_delegate_win.cc
index e1136ac3690fe2cc46fadde1b36d846544f8f4e8..f430e55895a3e257f572df47c039ff6dd111808b 100644
--- a/chrome/browser/policy/configuration_policy_provider_delegate_win.cc
+++ b/chrome/browser/policy/configuration_policy_provider_delegate_win.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/policy/configuration_policy_provider_delegate_win.h"
+#include <string>
+
#include <string.h>
#include "base/basictypes.h"
@@ -14,6 +16,8 @@
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "base/win/registry.h"
+#include "chrome/browser/policy/policy_bundle.h"
+#include "chrome/browser/policy/policy_map.h"
#include "policy/policy_constants.h"
using base::win::RegKey;
@@ -54,8 +58,9 @@ ConfigurationPolicyProviderDelegateWin::ConfigurationPolicyProviderDelegateWin(
registry_key_(registry_key),
level_(level) {}
-PolicyMap* ConfigurationPolicyProviderDelegateWin::Load() {
- PolicyMap* result = new PolicyMap();
+scoped_ptr<PolicyBundle> ConfigurationPolicyProviderDelegateWin::Load() {
+ scoped_ptr<PolicyBundle> bundle(new PolicyBundle());
+ PolicyMap& chrome_policy = bundle->Get(POLICY_DOMAIN_CHROME, std::string());
const PolicyDefinitionList::Entry* current;
for (current = policy_definition_list_->begin;
current != policy_definition_list_->end;
@@ -111,9 +116,9 @@ PolicyMap* ConfigurationPolicyProviderDelegateWin::Load() {
NOTREACHED();
}
if (value)
- result->Set(current->name, level_, scope, value);
+ chrome_policy.Set(current->name, level_, scope, value);
}
- return result;
+ return bundle.Pass();
}
bool ConfigurationPolicyProviderDelegateWin::GetRegistryPolicyString(

Powered by Google App Engine
This is Rietveld 408576698