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

Side by Side Diff: chrome/browser/policy/configuration_policy_pref_store.cc

Issue 6027004: Revert 69753 - Added group policy for disabling all client-side 3D APIs in Ch... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/policy/configuration_policy_pref_store.h" 5 #include "chrome/browser/policy/configuration_policy_pref_store.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 { Value::TYPE_BOOLEAN, kPolicyDisableAuthNegotiateCnameLookup, 183 { Value::TYPE_BOOLEAN, kPolicyDisableAuthNegotiateCnameLookup,
184 prefs::kDisableAuthNegotiateCnameLookup }, 184 prefs::kDisableAuthNegotiateCnameLookup },
185 { Value::TYPE_BOOLEAN, kPolicyEnableAuthNegotiatePort, 185 { Value::TYPE_BOOLEAN, kPolicyEnableAuthNegotiatePort,
186 prefs::kEnableAuthNegotiatePort }, 186 prefs::kEnableAuthNegotiatePort },
187 { Value::TYPE_STRING, kPolicyAuthServerWhitelist, 187 { Value::TYPE_STRING, kPolicyAuthServerWhitelist,
188 prefs::kAuthServerWhitelist }, 188 prefs::kAuthServerWhitelist },
189 { Value::TYPE_STRING, kPolicyAuthNegotiateDelegateWhitelist, 189 { Value::TYPE_STRING, kPolicyAuthNegotiateDelegateWhitelist,
190 prefs::kAuthNegotiateDelegateWhitelist }, 190 prefs::kAuthNegotiateDelegateWhitelist },
191 { Value::TYPE_STRING, kPolicyGSSAPILibraryName, 191 { Value::TYPE_STRING, kPolicyGSSAPILibraryName,
192 prefs::kGSSAPILibraryName }, 192 prefs::kGSSAPILibraryName },
193 { Value::TYPE_BOOLEAN, kPolicyDisable3DAPIs,
194 prefs::kDisable3DAPIs },
195 193
196 #if defined(OS_CHROMEOS) 194 #if defined(OS_CHROMEOS)
197 { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend, 195 { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend,
198 prefs::kEnableScreenLock }, 196 prefs::kEnableScreenLock },
199 #endif 197 #endif
200 }; 198 };
201 199
202 const ConfigurationPolicyPrefStore::PolicyToPreferenceMapEntry 200 const ConfigurationPolicyPrefStore::PolicyToPreferenceMapEntry
203 ConfigurationPolicyPrefStore::kDefaultSearchPolicyMap[] = { 201 ConfigurationPolicyPrefStore::kDefaultSearchPolicyMap[] = {
204 { Value::TYPE_BOOLEAN, kPolicyDefaultSearchProviderEnabled, 202 { Value::TYPE_BOOLEAN, kPolicyDefaultSearchProviderEnabled,
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 { kPolicyDisableAuthNegotiateCnameLookup, Value::TYPE_BOOLEAN, 303 { kPolicyDisableAuthNegotiateCnameLookup, Value::TYPE_BOOLEAN,
306 key::kDisableAuthNegotiateCnameLookup }, 304 key::kDisableAuthNegotiateCnameLookup },
307 { kPolicyEnableAuthNegotiatePort, Value::TYPE_BOOLEAN, 305 { kPolicyEnableAuthNegotiatePort, Value::TYPE_BOOLEAN,
308 key::kEnableAuthNegotiatePort }, 306 key::kEnableAuthNegotiatePort },
309 { kPolicyAuthServerWhitelist, Value::TYPE_STRING, 307 { kPolicyAuthServerWhitelist, Value::TYPE_STRING,
310 key::kAuthServerWhitelist }, 308 key::kAuthServerWhitelist },
311 { kPolicyAuthNegotiateDelegateWhitelist, Value::TYPE_STRING, 309 { kPolicyAuthNegotiateDelegateWhitelist, Value::TYPE_STRING,
312 key::kAuthNegotiateDelegateWhitelist }, 310 key::kAuthNegotiateDelegateWhitelist },
313 { kPolicyGSSAPILibraryName, Value::TYPE_STRING, 311 { kPolicyGSSAPILibraryName, Value::TYPE_STRING,
314 key::kGSSAPILibraryName }, 312 key::kGSSAPILibraryName },
315 { kPolicyDisable3DAPIs, Value::TYPE_BOOLEAN,
316 key::kDisable3DAPIs },
317 313
318 #if defined(OS_CHROMEOS) 314 #if defined(OS_CHROMEOS)
319 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN, 315 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN,
320 key::kChromeOsLockOnIdleSuspend }, 316 key::kChromeOsLockOnIdleSuspend },
321 #endif 317 #endif
322 }; 318 };
323 319
324 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = { 320 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = {
325 entries, 321 entries,
326 entries + arraysize(entries), 322 entries + arraysize(entries),
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 std::string()); 667 std::string());
672 return; 668 return;
673 } 669 }
674 } 670 }
675 // Required entries are not there. Remove any related entries. 671 // Required entries are not there. Remove any related entries.
676 RemovePreferencesOfMap(kDefaultSearchPolicyMap, 672 RemovePreferencesOfMap(kDefaultSearchPolicyMap,
677 arraysize(kDefaultSearchPolicyMap)); 673 arraysize(kDefaultSearchPolicyMap));
678 } 674 }
679 675
680 } // namespace policy 676 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/app/policy/policy_templates.json ('k') | chrome/browser/policy/configuration_policy_pref_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698