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

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

Issue 7326011: Revert 91842 - Introduce a policy to control the maximal number of connections per proxy server. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 { Value::TYPE_BOOLEAN, kPolicyTranslateEnabled, prefs::kEnableTranslate }, 267 { Value::TYPE_BOOLEAN, kPolicyTranslateEnabled, prefs::kEnableTranslate },
268 { Value::TYPE_BOOLEAN, kPolicyBookmarkBarEnabled, prefs::kEnableBookmarkBar }, 268 { Value::TYPE_BOOLEAN, kPolicyBookmarkBarEnabled, prefs::kEnableBookmarkBar },
269 { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins, 269 { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins,
270 prefs::kPluginsAllowOutdated }, 270 prefs::kPluginsAllowOutdated },
271 { Value::TYPE_BOOLEAN, kPolicyAlwaysAuthorizePlugins, 271 { Value::TYPE_BOOLEAN, kPolicyAlwaysAuthorizePlugins,
272 prefs::kPluginsAlwaysAuthorize }, 272 prefs::kPluginsAlwaysAuthorize },
273 { Value::TYPE_BOOLEAN, kPolicyEditBookmarksEnabled, 273 { Value::TYPE_BOOLEAN, kPolicyEditBookmarksEnabled,
274 prefs::kEditBookmarksEnabled }, 274 prefs::kEditBookmarksEnabled },
275 { Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs, 275 { Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs,
276 prefs::kAllowFileSelectionDialogs }, 276 prefs::kAllowFileSelectionDialogs },
277 { Value::TYPE_INTEGER, kPolicyMaxConnectionsPerProxy,
278 prefs::kMaxConnectionsPerProxy },
279 277
280 #if defined(OS_CHROMEOS) 278 #if defined(OS_CHROMEOS)
281 { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend, 279 { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend,
282 prefs::kEnableScreenLock }, 280 prefs::kEnableScreenLock },
283 #endif 281 #endif
284 }; 282 };
285 283
286 const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry 284 const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
287 ConfigurationPolicyPrefKeeper::kDefaultSearchPolicyMap[] = { 285 ConfigurationPolicyPrefKeeper::kDefaultSearchPolicyMap[] = {
288 { Value::TYPE_BOOLEAN, kPolicyDefaultSearchProviderEnabled, 286 { Value::TYPE_BOOLEAN, kPolicyDefaultSearchProviderEnabled,
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 { kPolicyAlwaysAuthorizePlugins, Value::TYPE_BOOLEAN, 1058 { kPolicyAlwaysAuthorizePlugins, Value::TYPE_BOOLEAN,
1061 key::kAlwaysAuthorizePlugins }, 1059 key::kAlwaysAuthorizePlugins },
1062 { kPolicyBookmarkBarEnabled, Value::TYPE_BOOLEAN, 1060 { kPolicyBookmarkBarEnabled, Value::TYPE_BOOLEAN,
1063 key::kBookmarkBarEnabled }, 1061 key::kBookmarkBarEnabled },
1064 { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN, 1062 { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN,
1065 key::kEditBookmarksEnabled }, 1063 key::kEditBookmarksEnabled },
1066 { kPolicyAllowFileSelectionDialogs, Value::TYPE_BOOLEAN, 1064 { kPolicyAllowFileSelectionDialogs, Value::TYPE_BOOLEAN,
1067 key::kAllowFileSelectionDialogs }, 1065 key::kAllowFileSelectionDialogs },
1068 { kPolicyDiskCacheDir, Value::TYPE_STRING, 1066 { kPolicyDiskCacheDir, Value::TYPE_STRING,
1069 key::kDiskCacheDir }, 1067 key::kDiskCacheDir },
1070 { kPolicyMaxConnectionsPerProxy, Value::TYPE_INTEGER,
1071 key::kMaxConnectionsPerProxy },
1072 1068
1073 #if defined(OS_CHROMEOS) 1069 #if defined(OS_CHROMEOS)
1074 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN, 1070 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN,
1075 key::kChromeOsLockOnIdleSuspend }, 1071 key::kChromeOsLockOnIdleSuspend },
1076 { kPolicyChromeOsReleaseChannel, Value::TYPE_STRING, 1072 { kPolicyChromeOsReleaseChannel, Value::TYPE_STRING,
1077 key::kChromeOsReleaseChannel }, 1073 key::kChromeOsReleaseChannel },
1078 #endif 1074 #endif
1079 }; 1075 };
1080 1076
1081 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = { 1077 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 // Update the initialization flag. 1126 // Update the initialization flag.
1131 if (!initialization_complete_ && 1127 if (!initialization_complete_ &&
1132 provider_->IsInitializationComplete()) { 1128 provider_->IsInitializationComplete()) {
1133 initialization_complete_ = true; 1129 initialization_complete_ = true;
1134 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, 1130 FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
1135 OnInitializationCompleted(true)); 1131 OnInitializationCompleted(true));
1136 } 1132 }
1137 } 1133 }
1138 1134
1139 } // namespace policy 1135 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('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