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

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

Issue 7014036: Split the policy refresh rate preference into user- and device-policy refresh rate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Temporarily added user policy refresh rate to both local_state and profile prefs. Rebased. Created 9 years, 6 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 prefs::kAuthNegotiateDelegateWhitelist }, 252 prefs::kAuthNegotiateDelegateWhitelist },
253 { Value::TYPE_STRING, kPolicyGSSAPILibraryName, 253 { Value::TYPE_STRING, kPolicyGSSAPILibraryName,
254 prefs::kGSSAPILibraryName }, 254 prefs::kGSSAPILibraryName },
255 { Value::TYPE_BOOLEAN, kPolicyAllowCrossOriginAuthPrompt, 255 { Value::TYPE_BOOLEAN, kPolicyAllowCrossOriginAuthPrompt,
256 prefs::kAllowCrossOriginAuthPrompt }, 256 prefs::kAllowCrossOriginAuthPrompt },
257 { Value::TYPE_BOOLEAN, kPolicyDisable3DAPIs, 257 { Value::TYPE_BOOLEAN, kPolicyDisable3DAPIs,
258 prefs::kDisable3DAPIs }, 258 prefs::kDisable3DAPIs },
259 { Value::TYPE_BOOLEAN, kPolicyDisablePluginFinder, 259 { Value::TYPE_BOOLEAN, kPolicyDisablePluginFinder,
260 prefs::kDisablePluginFinder }, 260 prefs::kDisablePluginFinder },
261 { Value::TYPE_INTEGER, kPolicyPolicyRefreshRate, 261 { Value::TYPE_INTEGER, kPolicyPolicyRefreshRate,
262 prefs::kPolicyRefreshRate }, 262 prefs::kUserPolicyRefreshRate },
263 { Value::TYPE_INTEGER, kPolicyDevicePolicyRefreshRate,
264 prefs::kDevicePolicyRefreshRate },
263 { Value::TYPE_BOOLEAN, kPolicyInstantEnabled, prefs::kInstantEnabled }, 265 { Value::TYPE_BOOLEAN, kPolicyInstantEnabled, prefs::kInstantEnabled },
264 { Value::TYPE_BOOLEAN, kPolicyDefaultBrowserSettingEnabled, 266 { Value::TYPE_BOOLEAN, kPolicyDefaultBrowserSettingEnabled,
265 prefs::kDefaultBrowserSettingEnabled }, 267 prefs::kDefaultBrowserSettingEnabled },
266 { Value::TYPE_BOOLEAN, kPolicyCloudPrintProxyEnabled, 268 { Value::TYPE_BOOLEAN, kPolicyCloudPrintProxyEnabled,
267 prefs::kCloudPrintProxyEnabled }, 269 prefs::kCloudPrintProxyEnabled },
268 { Value::TYPE_BOOLEAN, kPolicyTranslateEnabled, prefs::kEnableTranslate }, 270 { Value::TYPE_BOOLEAN, kPolicyTranslateEnabled, prefs::kEnableTranslate },
269 { Value::TYPE_BOOLEAN, kPolicyBookmarkBarEnabled, prefs::kEnableBookmarkBar }, 271 { Value::TYPE_BOOLEAN, kPolicyBookmarkBarEnabled, prefs::kEnableBookmarkBar },
270 { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins, 272 { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins,
271 prefs::kPluginsAllowOutdated }, 273 prefs::kPluginsAllowOutdated },
272 { Value::TYPE_BOOLEAN, kPolicyAlwaysAuthorizePlugins, 274 { Value::TYPE_BOOLEAN, kPolicyAlwaysAuthorizePlugins,
(...skipping 797 matching lines...) Expand 10 before | Expand all | Expand 10 after
1070 { kPolicyGSSAPILibraryName, Value::TYPE_STRING, 1072 { kPolicyGSSAPILibraryName, Value::TYPE_STRING,
1071 key::kGSSAPILibraryName }, 1073 key::kGSSAPILibraryName },
1072 { kPolicyAllowCrossOriginAuthPrompt, Value::TYPE_BOOLEAN, 1074 { kPolicyAllowCrossOriginAuthPrompt, Value::TYPE_BOOLEAN,
1073 key::kAllowCrossOriginAuthPrompt }, 1075 key::kAllowCrossOriginAuthPrompt },
1074 { kPolicyDisable3DAPIs, Value::TYPE_BOOLEAN, 1076 { kPolicyDisable3DAPIs, Value::TYPE_BOOLEAN,
1075 key::kDisable3DAPIs }, 1077 key::kDisable3DAPIs },
1076 { kPolicyDisablePluginFinder, Value::TYPE_BOOLEAN, 1078 { kPolicyDisablePluginFinder, Value::TYPE_BOOLEAN,
1077 key::kDisablePluginFinder }, 1079 key::kDisablePluginFinder },
1078 { kPolicyPolicyRefreshRate, Value::TYPE_INTEGER, 1080 { kPolicyPolicyRefreshRate, Value::TYPE_INTEGER,
1079 key::kPolicyRefreshRate }, 1081 key::kPolicyRefreshRate },
1082 { kPolicyDevicePolicyRefreshRate, Value::TYPE_INTEGER,
1083 key::kDevicePolicyRefreshRate },
1080 { kPolicyInstantEnabled, Value::TYPE_BOOLEAN, key::kInstantEnabled }, 1084 { kPolicyInstantEnabled, Value::TYPE_BOOLEAN, key::kInstantEnabled },
1081 { kPolicyDefaultBrowserSettingEnabled, Value::TYPE_BOOLEAN, 1085 { kPolicyDefaultBrowserSettingEnabled, Value::TYPE_BOOLEAN,
1082 key::kDefaultBrowserSettingEnabled }, 1086 key::kDefaultBrowserSettingEnabled },
1083 { kPolicyCloudPrintProxyEnabled, Value::TYPE_BOOLEAN, 1087 { kPolicyCloudPrintProxyEnabled, Value::TYPE_BOOLEAN,
1084 key::kCloudPrintProxyEnabled }, 1088 key::kCloudPrintProxyEnabled },
1085 { kPolicyDownloadDirectory, Value::TYPE_STRING, 1089 { kPolicyDownloadDirectory, Value::TYPE_STRING,
1086 key::kDownloadDirectory }, 1090 key::kDownloadDirectory },
1087 { kPolicyTranslateEnabled, Value::TYPE_BOOLEAN, key::kTranslateEnabled }, 1091 { kPolicyTranslateEnabled, Value::TYPE_BOOLEAN, key::kTranslateEnabled },
1088 { kPolicyAllowOutdatedPlugins, Value::TYPE_BOOLEAN, 1092 { kPolicyAllowOutdatedPlugins, Value::TYPE_BOOLEAN,
1089 key::kAllowOutdatedPlugins }, 1093 key::kAllowOutdatedPlugins },
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 // Update the initialization flag. 1137 // Update the initialization flag.
1134 if (!initialization_complete_ && 1138 if (!initialization_complete_ &&
1135 provider_->IsInitializationComplete()) { 1139 provider_->IsInitializationComplete()) {
1136 initialization_complete_ = true; 1140 initialization_complete_ = true;
1137 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, 1141 FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
1138 OnInitializationCompleted(true)); 1142 OnInitializationCompleted(true));
1139 } 1143 }
1140 } 1144 }
1141 1145
1142 } // namespace policy 1146 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698