Chromium Code Reviews

Side by Side Diff: chrome/common/pref_names.cc

Issue 5921003: Revert 69320 - Migrate HostReferralList and StartupDNSPrefetchList from local... (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.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
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/common/pref_names.h" 5 #include "chrome/common/pref_names.h"
6 6
7 namespace prefs { 7 namespace prefs {
8 8
9 // *************** PROFILE PREFS *************** 9 // *************** PROFILE PREFS ***************
10 // These are attached to the user profile 10 // These are attached to the user profile
(...skipping 176 matching lines...)
187 // Boolean which specifies whether we should ask the user if we should download 187 // Boolean which specifies whether we should ask the user if we should download
188 // a file (true) or just download it automatically. 188 // a file (true) or just download it automatically.
189 const char kPromptForDownload[] = "download.prompt_for_download"; 189 const char kPromptForDownload[] = "download.prompt_for_download";
190 190
191 // A boolean pref set to true if we're using Link Doctor error pages. 191 // A boolean pref set to true if we're using Link Doctor error pages.
192 const char kAlternateErrorPagesEnabled[] = "alternate_error_pages.enabled"; 192 const char kAlternateErrorPagesEnabled[] = "alternate_error_pages.enabled";
193 193
194 // A boolean pref set to true if DNS pre-fetching is being done in browser. 194 // A boolean pref set to true if DNS pre-fetching is being done in browser.
195 const char kDnsPrefetchingEnabled[] = "dns_prefetching.enabled"; 195 const char kDnsPrefetchingEnabled[] = "dns_prefetching.enabled";
196 196
197 // OBSOLETE: new pref now stored with user prefs instead of profile, as 197 // An adaptively identified list of domain names to be pre-fetched during the
198 // kDnsPrefetchingStartupList. 198 // next startup, based on what was actually needed during this startup.
199 const char kDnsStartupPrefetchList[] = "StartupDNSPrefetchList"; 199 const char kDnsStartupPrefetchList[] = "StartupDNSPrefetchList";
200 200
201 // An adaptively identified list of domain names to be pre-fetched during the 201 // Disables the SPDY protocol.
202 // next startup, based on what was actually needed during this startup. 202 const char kDisableSpdy[] = "spdy.disabled";
203 const char kDnsPrefetchingStartupList[] = "dns_prefetching.startup_list";
204
205 // OBSOLETE: new pref now stored with user prefs instead of profile, as
206 // kDnsPrefetchingHostReferralList.
207 const char kDnsHostReferralList[] = "HostReferralList";
208 203
209 // A list of host names used to fetch web pages, and their commonly used 204 // A list of host names used to fetch web pages, and their commonly used
210 // sub-resource hostnames (and expected latency benefits from pre-resolving, or 205 // sub-resource hostnames (and expected latency benefits from pre-resolving, or
211 // preconnecting to, such sub-resource hostnames). 206 // preconnecting to, such sub-resource hostnames).
212 // This list is adaptively grown and pruned. 207 // This list is adaptively grown and pruned.
213 const char kDnsPrefetchingHostReferralList[] = 208 const char kDnsHostReferralList[] = "HostReferralList";
214 "dns_prefetching.host_referral_list";
215
216 // Disables the SPDY protocol.
217 const char kDisableSpdy[] = "spdy.disabled";
218 209
219 // Is the cookie prompt expanded? 210 // Is the cookie prompt expanded?
220 const char kCookiePromptExpanded[] = "cookieprompt.expanded"; 211 const char kCookiePromptExpanded[] = "cookieprompt.expanded";
221 212
222 // Boolean pref indicating whether the instant confirm dialog has been shown. 213 // Boolean pref indicating whether the instant confirm dialog has been shown.
223 const char kInstantConfirmDialogShown[] = "instant.confirm_dialog_shown"; 214 const char kInstantConfirmDialogShown[] = "instant.confirm_dialog_shown";
224 215
225 // Boolean pref indicating if instant is enabled. 216 // Boolean pref indicating if instant is enabled.
226 const char kInstantEnabled[] = "instant.enabled"; 217 const char kInstantEnabled[] = "instant.enabled";
227 218
228 // Boolean pref indicating if instant was ever enabled. 219 // Boolean pref indicating if instant was ever enabled.
229 const char kInstantEnabledOnce[] = "instant.enabled_once"; 220 const char kInstantEnabledOnce[] = "instant.enabled_once";
230 221
231 // Time when instant was last enabled. 222 // Time when instant was last enabled.
232 const char kInstantEnabledTime[] = "instant.enabled_time"; 223 const char kInstantEnabledTime[] = "instant.enabled_time";
233 224
234 // Used to maintain instant promo keys. See PromoCounter for details of subkeys 225 // Used to maintain instant promo keys. See PromoCounter for details of subkeys
235 // that are used. 226 // that are used.
236 const char kInstantPromo[] = "instant.promo"; 227 const char kInstantPromo[] = "instant.promo";
237 228
238 // Used to migrate preferences from local state to user preferences to
239 // enable multiple profiles.
240 // Holds possible values:
241 // 0: no preferences migrated yet.
242 // 1: dns prefetching preferences stored in user preferences.
243 const char kMultipleProfilePrefMigration[] =
244 "profile.multiple_profile_prefs_version";
245
246 #if defined(USE_NSS) || defined(USE_OPENSSL) 229 #if defined(USE_NSS) || defined(USE_OPENSSL)
247 // Prefs for SSLConfigServicePref. Currently, these are only present on 230 // Prefs for SSLConfigServicePref. Currently, these are only present on
248 // and used by NSS/OpenSSL using OSes. 231 // and used by NSS/OpenSSL using OSes.
249 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled"; 232 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled";
250 const char kSSL3Enabled[] = "ssl.ssl3.enabled"; 233 const char kSSL3Enabled[] = "ssl.ssl3.enabled";
251 const char kTLS1Enabled[] = "ssl.tls1.enabled"; 234 const char kTLS1Enabled[] = "ssl.tls1.enabled";
252 #endif 235 #endif
253 236
254 #if defined(OS_CHROMEOS) 237 #if defined(OS_CHROMEOS)
255 // A boolean pref set to true if TapToClick is being done in browser. 238 // A boolean pref set to true if TapToClick is being done in browser.
(...skipping 888 matching lines...)
1144 const char kManagedDefaultPluginsSetting[] = 1127 const char kManagedDefaultPluginsSetting[] =
1145 "profile.managed_default_content_settings.plugins"; 1128 "profile.managed_default_content_settings.plugins";
1146 const char kManagedDefaultPopupsSetting[] = 1129 const char kManagedDefaultPopupsSetting[] =
1147 "profile.managed_default_content_settings.popups"; 1130 "profile.managed_default_content_settings.popups";
1148 1131
1149 // Dictionary for storing the set of known background pages (keys are extension 1132 // Dictionary for storing the set of known background pages (keys are extension
1150 // IDs of background page owners, value is a boolean that is true if the user 1133 // IDs of background page owners, value is a boolean that is true if the user
1151 // needs to acknowledge this page. 1134 // needs to acknowledge this page.
1152 const char kKnownBackgroundPages[] = "background_pages.known"; 1135 const char kKnownBackgroundPages[] = "background_pages.known";
1153 } // namespace prefs 1136 } // namespace prefs
OLDNEW
« no previous file with comments | « chrome/common/pref_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine