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

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

Issue 6793045: Change text of DNS prefetch option to Network prediction option. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another bad merge fix Created 9 years, 8 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/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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 const char kSearchProviderOverridesVersion[] = 223 const char kSearchProviderOverridesVersion[] =
224 "search_provider_overrides_version"; 224 "search_provider_overrides_version";
225 225
226 // Boolean which specifies whether we should ask the user if we should download 226 // Boolean which specifies whether we should ask the user if we should download
227 // a file (true) or just download it automatically. 227 // a file (true) or just download it automatically.
228 const char kPromptForDownload[] = "download.prompt_for_download"; 228 const char kPromptForDownload[] = "download.prompt_for_download";
229 229
230 // A boolean pref set to true if we're using Link Doctor error pages. 230 // A boolean pref set to true if we're using Link Doctor error pages.
231 const char kAlternateErrorPagesEnabled[] = "alternate_error_pages.enabled"; 231 const char kAlternateErrorPagesEnabled[] = "alternate_error_pages.enabled";
232 232
233 // A boolean pref set to true if DNS pre-fetching is being done in browser.
234 const char kDnsPrefetchingEnabled[] = "dns_prefetching.enabled";
235
236 // OBSOLETE: new pref now stored with user prefs instead of profile, as 233 // OBSOLETE: new pref now stored with user prefs instead of profile, as
237 // kDnsPrefetchingStartupList. 234 // kDnsPrefetchingStartupList.
238 const char kDnsStartupPrefetchList[] = "StartupDNSPrefetchList"; 235 const char kDnsStartupPrefetchList[] = "StartupDNSPrefetchList";
239 236
240 // An adaptively identified list of domain names to be pre-fetched during the 237 // An adaptively identified list of domain names to be pre-fetched during the
241 // next startup, based on what was actually needed during this startup. 238 // next startup, based on what was actually needed during this startup.
242 const char kDnsPrefetchingStartupList[] = "dns_prefetching.startup_list"; 239 const char kDnsPrefetchingStartupList[] = "dns_prefetching.startup_list";
243 240
244 // OBSOLETE: new pref now stored with user prefs instead of profile, as 241 // OBSOLETE: new pref now stored with user prefs instead of profile, as
245 // kDnsPrefetchingHostReferralList. 242 // kDnsPrefetchingHostReferralList.
(...skipping 28 matching lines...) Expand all
274 // Used to migrate preferences from local state to user preferences to 271 // Used to migrate preferences from local state to user preferences to
275 // enable multiple profiles. 272 // enable multiple profiles.
276 // BITMASK with possible values (see browser_prefs.cc for enum): 273 // BITMASK with possible values (see browser_prefs.cc for enum):
277 // 0: No preferences migrated. 274 // 0: No preferences migrated.
278 // 1: DNS preferences migrated: kDnsPrefetchingStartupList and HostReferralList 275 // 1: DNS preferences migrated: kDnsPrefetchingStartupList and HostReferralList
279 // 2: Browser window preferences migrated: kDevToolsSplitLocation and 276 // 2: Browser window preferences migrated: kDevToolsSplitLocation and
280 // kBrowserWindowPlacement 277 // kBrowserWindowPlacement
281 const char kMultipleProfilePrefMigration[] = 278 const char kMultipleProfilePrefMigration[] =
282 "local_state.multiple_profile_prefs_version"; 279 "local_state.multiple_profile_prefs_version";
283 280
281 // A boolean pref set to true if prediction of network actions is allowed.
282 // Actions include DNS prefetching, TCP and SSL preconnection, and prerendering
283 // of web pages.
284 // NOTE: The "dns_prefetching.enabled" value is used so that historical user
285 // preferences are not lost.
286 const char kNetworkPredictionEnabled[] = "dns_prefetching.enabled";
287
284 #if defined(OS_CHROMEOS) 288 #if defined(OS_CHROMEOS)
285 // An integer pref to initially mute volume if 1. 289 // An integer pref to initially mute volume if 1.
286 const char kAudioMute[] = "settings.audio.mute"; 290 const char kAudioMute[] = "settings.audio.mute";
287 291
288 // A double pref to set initial volume. 292 // A double pref to set initial volume.
289 const char kAudioVolume[] = "settings.audio.volume"; 293 const char kAudioVolume[] = "settings.audio.volume";
290 294
291 // A boolean pref set to true if TapToClick is being done in browser. 295 // A boolean pref set to true if TapToClick is being done in browser.
292 const char kTapToClickEnabled[] = "settings.touchpad.enable_tap_to_click"; 296 const char kTapToClickEnabled[] = "settings.touchpad.enable_tap_to_click";
293 297
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 "profile.managed_popups_blocked_for_urls"; 1279 "profile.managed_popups_blocked_for_urls";
1276 1280
1277 // Dictionary for storing the set of known background pages (keys are extension 1281 // Dictionary for storing the set of known background pages (keys are extension
1278 // IDs of background page owners, value is a boolean that is true if the user 1282 // IDs of background page owners, value is a boolean that is true if the user
1279 // needs to acknowledge this page. 1283 // needs to acknowledge this page.
1280 const char kKnownBackgroundPages[] = "background_pages.known"; 1284 const char kKnownBackgroundPages[] = "background_pages.known";
1281 1285
1282 // Dictionary that maps URL schemes (protocols) to URL handlers. 1286 // Dictionary that maps URL schemes (protocols) to URL handlers.
1283 const char kRegisteredProtocolHandlers[] = "registered_protocol_handlers"; 1287 const char kRegisteredProtocolHandlers[] = "registered_protocol_handlers";
1284 } // namespace prefs 1288 } // namespace prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698