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

Side by Side Diff: chrome/browser/ui/options/options_util.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: Fixes for localized_error.cc 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/browser/ui/options/options_util.h" 5 #include "chrome/browser/ui/options/options_util.h"
6 6
7 #include "base/threading/thread_restrictions.h" 7 #include "base/threading/thread_restrictions.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/download/download_manager.h" 10 #include "chrome/browser/download/download_manager.h"
(...skipping 19 matching lines...) Expand all
30 prefs::kClearSiteDataOnExit, 30 prefs::kClearSiteDataOnExit,
31 prefs::kCookieBehavior, 31 prefs::kCookieBehavior,
32 prefs::kDefaultCharset, 32 prefs::kDefaultCharset,
33 prefs::kDefaultZoomLevel, 33 prefs::kDefaultZoomLevel,
34 prefs::kDeleteBrowsingHistory, 34 prefs::kDeleteBrowsingHistory,
35 prefs::kDeleteCache, 35 prefs::kDeleteCache,
36 prefs::kDeleteCookies, 36 prefs::kDeleteCookies,
37 prefs::kDeleteDownloadHistory, 37 prefs::kDeleteDownloadHistory,
38 prefs::kDeleteFormData, 38 prefs::kDeleteFormData,
39 prefs::kDeletePasswords, 39 prefs::kDeletePasswords,
40 prefs::kDnsPrefetchingEnabled, 40 prefs::kNetworkPredictionEnabled,
41 #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) 41 #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
42 prefs::kCertRevocationCheckingEnabled, 42 prefs::kCertRevocationCheckingEnabled,
43 prefs::kSSL3Enabled, 43 prefs::kSSL3Enabled,
44 prefs::kTLS1Enabled, 44 prefs::kTLS1Enabled,
45 #endif 45 #endif
46 #if defined(OS_CHROMEOS) 46 #if defined(OS_CHROMEOS)
47 prefs::kTapToClickEnabled, 47 prefs::kTapToClickEnabled,
48 prefs::kTouchpadSensitivity, 48 prefs::kTouchpadSensitivity,
49 #endif 49 #endif
50 prefs::kDownloadDefaultDirectory, 50 prefs::kDownloadDefaultDirectory,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 if (metrics) { 128 if (metrics) {
129 metrics->SetUserPermitsUpload(enabled); 129 metrics->SetUserPermitsUpload(enabled);
130 if (enabled) 130 if (enabled)
131 metrics->Start(); 131 metrics->Start();
132 else 132 else
133 metrics->Stop(); 133 metrics->Stop();
134 } 134 }
135 135
136 return enabled; 136 return enabled;
137 } 137 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698