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

Side by Side Diff: chrome/browser/net/net_pref_observer.cc

Issue 11345008: Remove content::NotificationObserver dependency from most Prefs code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for commit Created 8 years, 1 month 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/net/predictor.h" 7 #include "chrome/browser/net/predictor.h"
8 #include "chrome/browser/prefs/pref_service.h" 8 #include "chrome/browser/prefs/pref_service.h"
9 #include "chrome/browser/prerender/prerender_manager.h" 9 #include "chrome/browser/prerender/prerender_manager.h"
10 #include "chrome/common/chrome_notification_types.h" 10 #include "chrome/common/chrome_notification_types.h"
(...skipping 16 matching lines...) Expand all
27 this); 27 this);
28 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this); 28 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this);
29 29
30 ApplySettings(); 30 ApplySettings();
31 } 31 }
32 32
33 NetPrefObserver::~NetPrefObserver() { 33 NetPrefObserver::~NetPrefObserver() {
34 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 34 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
35 } 35 }
36 36
37 void NetPrefObserver::Observe(int type, 37 void NetPrefObserver::OnPreferenceChanged(PrefServiceBase* service,
38 const content::NotificationSource& source, 38 const std::string& pref_name) {
39 const content::NotificationDetails& details) {
40 DCHECK_EQ(type, chrome::NOTIFICATION_PREF_CHANGED);
41 ApplySettings(); 39 ApplySettings();
42 } 40 }
43 41
44 void NetPrefObserver::ApplySettings() { 42 void NetPrefObserver::ApplySettings() {
45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 43 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
46 44
47 predictor_->EnablePredictor(*network_prediction_enabled_); 45 predictor_->EnablePredictor(*network_prediction_enabled_);
48 if (prerender_manager_) 46 if (prerender_manager_)
49 prerender_manager_->set_enabled(*network_prediction_enabled_); 47 prerender_manager_->set_enabled(*network_prediction_enabled_);
50 if (spdy_disabled_.IsManaged()) 48 if (spdy_disabled_.IsManaged())
51 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); 49 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
52 } 50 }
53 51
54 // static 52 // static
55 void NetPrefObserver::RegisterPrefs(PrefService* prefs) { 53 void NetPrefObserver::RegisterPrefs(PrefService* prefs) {
56 prefs->RegisterBooleanPref(prefs::kNetworkPredictionEnabled, 54 prefs->RegisterBooleanPref(prefs::kNetworkPredictionEnabled,
57 true, 55 true,
58 PrefService::SYNCABLE_PREF); 56 PrefService::SYNCABLE_PREF);
59 prefs->RegisterBooleanPref(prefs::kDisableSpdy, 57 prefs->RegisterBooleanPref(prefs::kDisableSpdy,
60 false, 58 false,
61 PrefService::UNSYNCABLE_PREF); 59 PrefService::UNSYNCABLE_PREF);
62 } 60 }
OLDNEW
« no previous file with comments | « chrome/browser/net/net_pref_observer.h ('k') | chrome/browser/net/pref_proxy_config_tracker_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698