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

Side by Side Diff: chrome/browser/chromeos/policy/login_profile_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: Fixed another test. 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/login_profile_policy_provider.h" 5 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // |device_policy| is unset, does nothing. 57 // |device_policy| is unset, does nothing.
58 void ApplyDevicePolicyAsRecommendedPolicy(const std::string& device_policy, 58 void ApplyDevicePolicyAsRecommendedPolicy(const std::string& device_policy,
59 const std::string& user_policy, 59 const std::string& user_policy,
60 const PolicyMap& device_policy_map, 60 const PolicyMap& device_policy_map,
61 PolicyMap* user_policy_map) { 61 PolicyMap* user_policy_map) {
62 const base::Value* value = device_policy_map.GetValue(device_policy); 62 const base::Value* value = device_policy_map.GetValue(device_policy);
63 if (value) { 63 if (value) {
64 user_policy_map->Set(user_policy, 64 user_policy_map->Set(user_policy,
65 POLICY_LEVEL_RECOMMENDED, 65 POLICY_LEVEL_RECOMMENDED,
66 POLICY_SCOPE_USER, 66 POLICY_SCOPE_USER,
67 POLICY_SOURCE_CLOUD,
67 value->DeepCopy(), 68 value->DeepCopy(),
68 NULL); 69 NULL);
69 } 70 }
70 } 71 }
71 72
72 // Applies |value| as the mandatory value of |user_policy| in |user_policy_map|. 73 // Applies |value| as the mandatory value of |user_policy| in |user_policy_map|.
73 // If |value| is NULL, does nothing. 74 // If |value| is NULL, does nothing.
74 void ApplyValueAsMandatoryPolicy(const base::Value* value, 75 void ApplyValueAsMandatoryPolicy(const base::Value* value,
75 const std::string& user_policy, 76 const std::string& user_policy,
76 PolicyMap* user_policy_map) { 77 PolicyMap* user_policy_map) {
77 if (value) { 78 if (value) {
78 user_policy_map->Set(user_policy, 79 user_policy_map->Set(user_policy,
79 POLICY_LEVEL_MANDATORY, 80 POLICY_LEVEL_MANDATORY,
80 POLICY_SCOPE_USER, 81 POLICY_SCOPE_USER,
82 POLICY_SOURCE_CLOUD,
81 value->DeepCopy(), 83 value->DeepCopy(),
82 NULL); 84 NULL);
83 } 85 }
84 } 86 }
85 87
86 } // namespace 88 } // namespace
87 89
88 LoginProfilePolicyProvider::LoginProfilePolicyProvider( 90 LoginProfilePolicyProvider::LoginProfilePolicyProvider(
89 PolicyService* device_policy_service) 91 PolicyService* device_policy_service)
90 : device_policy_service_(device_policy_service), 92 : device_policy_service_(device_policy_service),
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 ApplyValueAsMandatoryPolicy(policy_value.get(), 199 ApplyValueAsMandatoryPolicy(policy_value.get(),
198 key::kPowerManagementIdleSettings, 200 key::kPowerManagementIdleSettings,
199 &user_policy_map); 201 &user_policy_map);
200 } 202 }
201 } 203 }
202 204
203 UpdatePolicy(bundle.Pass()); 205 UpdatePolicy(bundle.Pass());
204 } 206 }
205 207
206 } // namespace policy 208 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698