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

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

Issue 136633005: Turn back spoken feedback setting into a system-wide (non-per-user) preference (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 const PolicyMap& device_policy_map = 113 const PolicyMap& device_policy_map =
114 device_policy_service_->GetPolicies(chrome_namespaces); 114 device_policy_service_->GetPolicies(chrome_namespaces);
115 scoped_ptr<PolicyBundle> bundle(new PolicyBundle); 115 scoped_ptr<PolicyBundle> bundle(new PolicyBundle);
116 PolicyMap& user_policy_map = bundle->Get(chrome_namespaces); 116 PolicyMap& user_policy_map = bundle->Get(chrome_namespaces);
117 117
118 ApplyDevicePolicyAsRecommendedPolicy( 118 ApplyDevicePolicyAsRecommendedPolicy(
119 key::kDeviceLoginScreenDefaultLargeCursorEnabled, 119 key::kDeviceLoginScreenDefaultLargeCursorEnabled,
120 key::kLargeCursorEnabled, 120 key::kLargeCursorEnabled,
121 device_policy_map, &user_policy_map); 121 device_policy_map, &user_policy_map);
122 ApplyDevicePolicyAsRecommendedPolicy( 122 ApplyDevicePolicyAsRecommendedPolicy(
123 key::kDeviceLoginScreenDefaultSpokenFeedbackEnabled,
124 key::kSpokenFeedbackEnabled,
125 device_policy_map, &user_policy_map);
126 ApplyDevicePolicyAsRecommendedPolicy(
127 key::kDeviceLoginScreenDefaultHighContrastEnabled, 123 key::kDeviceLoginScreenDefaultHighContrastEnabled,
128 key::kHighContrastEnabled, 124 key::kHighContrastEnabled,
129 device_policy_map, &user_policy_map); 125 device_policy_map, &user_policy_map);
130 ApplyDevicePolicyAsRecommendedPolicy( 126 ApplyDevicePolicyAsRecommendedPolicy(
131 key::kDeviceLoginScreenDefaultScreenMagnifierType, 127 key::kDeviceLoginScreenDefaultScreenMagnifierType,
132 key::kScreenMagnifierType, 128 key::kScreenMagnifierType,
133 device_policy_map, &user_policy_map); 129 device_policy_map, &user_policy_map);
134 130
135 // TODO(bartfab): Consolidate power management user policies into a single 131 // TODO(bartfab): Consolidate power management user policies into a single
136 // JSON policy, allowing the value of the device policy to be simply forwarded 132 // JSON policy, allowing the value of the device policy to be simply forwarded
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 ApplyValueAsMandatoryPolicy( 169 ApplyValueAsMandatoryPolicy(
174 power_management_policy.GetUserActivityScreenDimDelayScale(), 170 power_management_policy.GetUserActivityScreenDimDelayScale(),
175 key::kUserActivityScreenDimDelayScale, 171 key::kUserActivityScreenDimDelayScale,
176 &user_policy_map); 172 &user_policy_map);
177 } 173 }
178 174
179 UpdatePolicy(bundle.Pass()); 175 UpdatePolicy(bundle.Pass());
180 } 176 }
181 177
182 } // namespace policy 178 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698