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

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

Issue 10908145: Converted policy.PolicyTest.testDisableSPDY pyauto test to browser_tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « chrome/browser/net/net_pref_observer.h ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/bind.h"
8 #include "chrome/browser/net/predictor.h" 7 #include "chrome/browser/net/predictor.h"
9 #include "chrome/browser/prefs/pref_service.h" 8 #include "chrome/browser/prefs/pref_service.h"
10 #include "chrome/browser/prerender/prerender_manager.h" 9 #include "chrome/browser/prerender/prerender_manager.h"
11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/common/chrome_notification_types.h" 10 #include "chrome/common/chrome_notification_types.h"
13 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
14 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
15 #include "content/public/browser/notification_details.h"
16 #include "net/http/http_stream_factory.h" 13 #include "net/http/http_stream_factory.h"
17 14
18 using content::BrowserThread; 15 using content::BrowserThread;
19 16
20 NetPrefObserver::NetPrefObserver(PrefService* prefs, 17 NetPrefObserver::NetPrefObserver(PrefService* prefs,
21 prerender::PrerenderManager* prerender_manager, 18 prerender::PrerenderManager* prerender_manager,
22 chrome_browser_net::Predictor* predictor) 19 chrome_browser_net::Predictor* predictor)
23 : prerender_manager_(prerender_manager), 20 : prerender_manager_(prerender_manager),
24 predictor_(predictor) { 21 predictor_(predictor) {
25 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 22 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
26 DCHECK(prefs); 23 DCHECK(prefs);
27 DCHECK(predictor); 24 DCHECK(predictor);
28 25
29 network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs, 26 network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
30 this); 27 this);
31 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this); 28 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, this);
32 29
33 ApplySettings(NULL); 30 ApplySettings();
34 } 31 }
35 32
36 NetPrefObserver::~NetPrefObserver() { 33 NetPrefObserver::~NetPrefObserver() {
37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 34 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
38 } 35 }
39 36
40 void NetPrefObserver::Observe(int type, 37 void NetPrefObserver::Observe(int type,
41 const content::NotificationSource& source, 38 const content::NotificationSource& source,
42 const content::NotificationDetails& details) { 39 const content::NotificationDetails& details) {
43 DCHECK_EQ(type, chrome::NOTIFICATION_PREF_CHANGED); 40 DCHECK_EQ(type, chrome::NOTIFICATION_PREF_CHANGED);
44 41 ApplySettings();
45 std::string* pref_name = content::Details<std::string>(details).ptr();
46 ApplySettings(pref_name);
47 } 42 }
48 43
49 void NetPrefObserver::ApplySettings(const std::string* pref_name) { 44 void NetPrefObserver::ApplySettings() {
50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
51 46
52 predictor_->EnablePredictor(*network_prediction_enabled_); 47 predictor_->EnablePredictor(*network_prediction_enabled_);
53 if (prerender_manager_) 48 if (prerender_manager_)
54 prerender_manager_->set_enabled(*network_prediction_enabled_); 49 prerender_manager_->set_enabled(*network_prediction_enabled_);
55 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); 50 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
56 } 51 }
57 52
58 // static 53 // static
59 void NetPrefObserver::RegisterPrefs(PrefService* prefs) { 54 void NetPrefObserver::RegisterPrefs(PrefService* prefs) {
60 prefs->RegisterBooleanPref(prefs::kNetworkPredictionEnabled, 55 prefs->RegisterBooleanPref(prefs::kNetworkPredictionEnabled,
61 true, 56 true,
62 PrefService::SYNCABLE_PREF); 57 PrefService::SYNCABLE_PREF);
63 prefs->RegisterBooleanPref(prefs::kDisableSpdy, 58 prefs->RegisterBooleanPref(prefs::kDisableSpdy,
64 false, 59 false,
65 PrefService::UNSYNCABLE_PREF); 60 PrefService::UNSYNCABLE_PREF);
66 } 61 }
OLDNEW
« no previous file with comments | « chrome/browser/net/net_pref_observer.h ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698