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

Unified Diff: chrome/browser/net/net_pref_observer.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/net/net_pref_observer.cc
diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc
index 0a1a01c950ed2f70f907b04b97d36068c5fa0941..597af9400aafddb3a61d41b1239b9d849efbd4fb 100644
--- a/chrome/browser/net/net_pref_observer.cc
+++ b/chrome/browser/net/net_pref_observer.cc
@@ -32,7 +32,8 @@ NetPrefObserver::NetPrefObserver(PrefService* prefs,
: prerender_manager_(prerender_manager) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(prefs);
- dns_prefetching_enabled_.Init(prefs::kDnsPrefetchingEnabled, prefs, this);
+ network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
+ this);
spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this);
http_throttling_enabled_.Init(prefs::kHttpThrottlingEnabled, prefs, this);
@@ -55,9 +56,9 @@ void NetPrefObserver::Observe(NotificationType type,
void NetPrefObserver::ApplySettings(const std::string* pref_name) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- chrome_browser_net::EnablePredictor(*dns_prefetching_enabled_);
+ chrome_browser_net::EnablePredictor(*network_prediction_enabled_);
if (prerender_manager_)
- prerender_manager_->set_enabled(*dns_prefetching_enabled_);
+ prerender_manager_->set_enabled(*network_prediction_enabled_);
net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
if (!pref_name || *pref_name == prefs::kHttpThrottlingEnabled) {
@@ -70,6 +71,7 @@ void NetPrefObserver::ApplySettings(const std::string* pref_name) {
// static
void NetPrefObserver::RegisterPrefs(PrefService* prefs) {
+ prefs->RegisterBooleanPref(prefs::kNetworkPredictionEnabled, true);
prefs->RegisterBooleanPref(prefs::kDisableSpdy, false);
prefs->RegisterBooleanPref(prefs::kHttpThrottlingEnabled, false);
}

Powered by Google App Engine
This is Rietveld 408576698