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

Side by Side 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: 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/net/net_pref_observer.h" 5 #include "chrome/browser/net/net_pref_observer.h"
6 6
7 #include "base/task.h" 7 #include "base/task.h"
8 #include "chrome/browser/net/predictor_api.h" 8 #include "chrome/browser/net/predictor_api.h"
9 #include "chrome/browser/prefs/pref_service.h" 9 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/prerender/prerender_manager.h" 10 #include "chrome/browser/prerender/prerender_manager.h"
(...skipping 14 matching lines...) Expand all
25 enforce); 25 enforce);
26 } 26 }
27 27
28 } 28 }
29 29
30 NetPrefObserver::NetPrefObserver(PrefService* prefs, 30 NetPrefObserver::NetPrefObserver(PrefService* prefs,
31 prerender::PrerenderManager* prerender_manager) 31 prerender::PrerenderManager* prerender_manager)
32 : prerender_manager_(prerender_manager) { 32 : prerender_manager_(prerender_manager) {
33 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 33 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
34 DCHECK(prefs); 34 DCHECK(prefs);
35 dns_prefetching_enabled_.Init(prefs::kDnsPrefetchingEnabled, prefs, this); 35 network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
36 this);
36 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this); 37 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this);
37 http_throttling_enabled_.Init(prefs::kHttpThrottlingEnabled, prefs, this); 38 http_throttling_enabled_.Init(prefs::kHttpThrottlingEnabled, prefs, this);
38 39
39 ApplySettings(NULL); 40 ApplySettings(NULL);
40 } 41 }
41 42
42 NetPrefObserver::~NetPrefObserver() { 43 NetPrefObserver::~NetPrefObserver() {
43 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 44 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
44 } 45 }
45 46
46 void NetPrefObserver::Observe(NotificationType type, 47 void NetPrefObserver::Observe(NotificationType type,
47 const NotificationSource& source, 48 const NotificationSource& source,
48 const NotificationDetails& details) { 49 const NotificationDetails& details) {
49 DCHECK_EQ(type.value, NotificationType::PREF_CHANGED); 50 DCHECK_EQ(type.value, NotificationType::PREF_CHANGED);
50 51
51 std::string* pref_name = Details<std::string>(details).ptr(); 52 std::string* pref_name = Details<std::string>(details).ptr();
52 ApplySettings(pref_name); 53 ApplySettings(pref_name);
53 } 54 }
54 55
55 void NetPrefObserver::ApplySettings(const std::string* pref_name) { 56 void NetPrefObserver::ApplySettings(const std::string* pref_name) {
56 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 57 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
57 58
58 chrome_browser_net::EnablePredictor(*dns_prefetching_enabled_); 59 chrome_browser_net::EnablePredictor(*network_prediction_enabled_);
59 if (prerender_manager_) 60 if (prerender_manager_)
60 prerender_manager_->set_enabled(*dns_prefetching_enabled_); 61 prerender_manager_->set_enabled(*network_prediction_enabled_);
61 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); 62 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
62 63
63 if (!pref_name || *pref_name == prefs::kHttpThrottlingEnabled) { 64 if (!pref_name || *pref_name == prefs::kHttpThrottlingEnabled) {
64 BrowserThread::PostTask( 65 BrowserThread::PostTask(
65 BrowserThread::IO, FROM_HERE, 66 BrowserThread::IO, FROM_HERE,
66 NewRunnableFunction(SetEnforceThrottlingOnThrottlerManager, 67 NewRunnableFunction(SetEnforceThrottlingOnThrottlerManager,
67 *http_throttling_enabled_)); 68 *http_throttling_enabled_));
68 } 69 }
69 } 70 }
70 71
71 // static 72 // static
72 void NetPrefObserver::RegisterPrefs(PrefService* prefs) { 73 void NetPrefObserver::RegisterPrefs(PrefService* prefs) {
74 prefs->RegisterBooleanPref(prefs::kNetworkPredictionEnabled, true);
73 prefs->RegisterBooleanPref(prefs::kDisableSpdy, false); 75 prefs->RegisterBooleanPref(prefs::kDisableSpdy, false);
74 prefs->RegisterBooleanPref(prefs::kHttpThrottlingEnabled, false); 76 prefs->RegisterBooleanPref(prefs::kHttpThrottlingEnabled, false);
75 } 77 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698