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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_policy_provider.cc

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Increased ID range for Messages. Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" 5 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/policy/device_local_account.h" 9 #include "chrome/browser/chromeos/policy/device_local_account.h"
10 #include "chrome/browser/chromeos/policy/device_local_account_external_data_mana ger.h" 10 #include "chrome/browser/chromeos/policy/device_local_account_external_data_mana ger.h"
(...skipping 11 matching lines...) Expand all
22 DeviceLocalAccountPolicyProvider::DeviceLocalAccountPolicyProvider( 22 DeviceLocalAccountPolicyProvider::DeviceLocalAccountPolicyProvider(
23 const std::string& user_id, 23 const std::string& user_id,
24 DeviceLocalAccountPolicyService* service, 24 DeviceLocalAccountPolicyService* service,
25 scoped_ptr<PolicyMap> chrome_policy_overrides) 25 scoped_ptr<PolicyMap> chrome_policy_overrides)
26 : user_id_(user_id), 26 : user_id_(user_id),
27 service_(service), 27 service_(service),
28 chrome_policy_overrides_(chrome_policy_overrides.Pass()), 28 chrome_policy_overrides_(chrome_policy_overrides.Pass()),
29 store_initialized_(false), 29 store_initialized_(false),
30 waiting_for_policy_refresh_(false), 30 waiting_for_policy_refresh_(false),
31 weak_factory_(this) { 31 weak_factory_(this) {
32 source_ = POLICY_SOURCE_CLOUD;
Thiemo Nagel 2015/09/04 20:15:53 I'd suggest to add a comment why this always is cl
fhorschig 2015/09/07 14:09:33 Done.
32 service_->AddObserver(this); 33 service_->AddObserver(this);
33 UpdateFromBroker(); 34 UpdateFromBroker();
34 } 35 }
35 36
36 DeviceLocalAccountPolicyProvider::~DeviceLocalAccountPolicyProvider() { 37 DeviceLocalAccountPolicyProvider::~DeviceLocalAccountPolicyProvider() {
37 service_->RemoveObserver(this); 38 service_->RemoveObserver(this);
38 } 39 }
39 40
40 // static 41 // static
41 scoped_ptr<DeviceLocalAccountPolicyProvider> 42 scoped_ptr<DeviceLocalAccountPolicyProvider>
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 } 164 }
164 165
165 // Apply overrides. 166 // Apply overrides.
166 if (chrome_policy_overrides_) { 167 if (chrome_policy_overrides_) {
167 PolicyMap& chrome_policy = 168 PolicyMap& chrome_policy =
168 bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())); 169 bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
169 for (PolicyMap::const_iterator it(chrome_policy_overrides_->begin()); 170 for (PolicyMap::const_iterator it(chrome_policy_overrides_->begin());
170 it != chrome_policy_overrides_->end(); 171 it != chrome_policy_overrides_->end();
171 ++it) { 172 ++it) {
172 const PolicyMap::Entry& entry = it->second; 173 const PolicyMap::Entry& entry = it->second;
173 chrome_policy.Set( 174 chrome_policy.SetWithSource(it->first,
174 it->first, entry.level, entry.scope, entry.value->DeepCopy(), NULL); 175 entry.level,
176 entry.scope,
177 entry.value->DeepCopy(),
178 NULL,
179 POLICY_SOURCE_ENFORCED);
175 } 180 }
176 } 181 }
177 182
178 UpdatePolicy(bundle.Pass()); 183 UpdatePolicy(bundle.Pass());
179 } 184 }
180 185
181 } // namespace policy 186 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698