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

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

Issue 7528024: Add a policy to allow NTP promotions & default apps to be disabled. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Disable app promo tests for ChromeOS. Created 9 years, 4 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 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins, 275 { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins,
276 prefs::kPluginsAllowOutdated }, 276 prefs::kPluginsAllowOutdated },
277 { Value::TYPE_BOOLEAN, kPolicyAlwaysAuthorizePlugins, 277 { Value::TYPE_BOOLEAN, kPolicyAlwaysAuthorizePlugins,
278 prefs::kPluginsAlwaysAuthorize }, 278 prefs::kPluginsAlwaysAuthorize },
279 { Value::TYPE_BOOLEAN, kPolicyEditBookmarksEnabled, 279 { Value::TYPE_BOOLEAN, kPolicyEditBookmarksEnabled,
280 prefs::kEditBookmarksEnabled }, 280 prefs::kEditBookmarksEnabled },
281 { Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs, 281 { Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs,
282 prefs::kAllowFileSelectionDialogs }, 282 prefs::kAllowFileSelectionDialogs },
283 { Value::TYPE_INTEGER, kPolicyMaxConnectionsPerProxy, 283 { Value::TYPE_INTEGER, kPolicyMaxConnectionsPerProxy,
284 prefs::kMaxConnectionsPerProxy }, 284 prefs::kMaxConnectionsPerProxy },
285 { Value::TYPE_BOOLEAN, kPolicyHideWebStorePromo,
286 prefs::kNTPHideWebStorePromo },
285 287
286 #if defined(OS_CHROMEOS) 288 #if defined(OS_CHROMEOS)
287 { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend, 289 { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend,
288 prefs::kEnableScreenLock }, 290 prefs::kEnableScreenLock },
289 { Value::TYPE_STRING, kPolicyChromeOsReleaseChannel, 291 { Value::TYPE_STRING, kPolicyChromeOsReleaseChannel,
290 prefs::kChromeOsReleaseChannel }, 292 prefs::kChromeOsReleaseChannel },
291 #endif 293 #endif
292 }; 294 };
293 295
294 const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry 296 const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 { kPolicyBookmarkBarEnabled, Value::TYPE_BOOLEAN, 1086 { kPolicyBookmarkBarEnabled, Value::TYPE_BOOLEAN,
1085 key::kBookmarkBarEnabled }, 1087 key::kBookmarkBarEnabled },
1086 { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN, 1088 { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN,
1087 key::kEditBookmarksEnabled }, 1089 key::kEditBookmarksEnabled },
1088 { kPolicyAllowFileSelectionDialogs, Value::TYPE_BOOLEAN, 1090 { kPolicyAllowFileSelectionDialogs, Value::TYPE_BOOLEAN,
1089 key::kAllowFileSelectionDialogs }, 1091 key::kAllowFileSelectionDialogs },
1090 { kPolicyDiskCacheDir, Value::TYPE_STRING, 1092 { kPolicyDiskCacheDir, Value::TYPE_STRING,
1091 key::kDiskCacheDir }, 1093 key::kDiskCacheDir },
1092 { kPolicyMaxConnectionsPerProxy, Value::TYPE_INTEGER, 1094 { kPolicyMaxConnectionsPerProxy, Value::TYPE_INTEGER,
1093 key::kMaxConnectionsPerProxy }, 1095 key::kMaxConnectionsPerProxy },
1096 { kPolicyHideWebStorePromo, Value::TYPE_BOOLEAN,
1097 key::kHideWebStorePromo },
1094 1098
1095 #if defined(OS_CHROMEOS) 1099 #if defined(OS_CHROMEOS)
1096 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN, 1100 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN,
1097 key::kChromeOsLockOnIdleSuspend }, 1101 key::kChromeOsLockOnIdleSuspend },
1098 { kPolicyChromeOsReleaseChannel, Value::TYPE_STRING, 1102 { kPolicyChromeOsReleaseChannel, Value::TYPE_STRING,
1099 key::kChromeOsReleaseChannel }, 1103 key::kChromeOsReleaseChannel },
1100 #endif 1104 #endif
1101 }; 1105 };
1102 1106
1103 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = { 1107 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
1138 // Update the initialization flag. 1142 // Update the initialization flag.
1139 if (!initialization_complete_ && 1143 if (!initialization_complete_ &&
1140 provider_->IsInitializationComplete()) { 1144 provider_->IsInitializationComplete()) {
1141 initialization_complete_ = true; 1145 initialization_complete_ = true;
1142 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, 1146 FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
1143 OnInitializationCompleted(true)); 1147 OnInitializationCompleted(true));
1144 } 1148 }
1145 } 1149 }
1146 1150
1147 } // namespace policy 1151 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698