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

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

Issue 519583005: Remove PrerenderManager.enabled_ and related members. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove enabled from prerender_view.js. Created 6 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
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/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
mmenke 2014/09/03 14:30:55 While you're here...I don't think this is used?
Bence 2014/09/03 17:05:17 Done.
9 #include "chrome/browser/net/predictor.h" 9 #include "chrome/browser/net/predictor.h"
10 #include "chrome/browser/prerender/prerender_manager.h" 10 #include "chrome/browser/prerender/prerender_manager.h"
mmenke 2014/09/03 14:30:55 Not needed.
Bence 2014/09/03 17:05:17 Done.
11 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
12 #include "components/pref_registry/pref_registry_syncable.h" 12 #include "components/pref_registry/pref_registry_syncable.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "net/http/http_stream_factory.h" 14 #include "net/http/http_stream_factory.h"
15 15
16 using content::BrowserThread; 16 using content::BrowserThread;
17 17
18 NetPrefObserver::NetPrefObserver(PrefService* prefs, 18 NetPrefObserver::NetPrefObserver(PrefService* prefs,
19 prerender::PrerenderManager* prerender_manager, 19 prerender::PrerenderManager* prerender_manager,
20 chrome_browser_net::Predictor* predictor) 20 chrome_browser_net::Predictor* predictor)
21 : prerender_manager_(prerender_manager), 21 : predictor_(predictor) {
22 predictor_(predictor) {
23 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 22 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
24 DCHECK(prefs); 23 DCHECK(prefs);
25 DCHECK(predictor); 24 DCHECK(predictor);
26 25
27 base::Closure prefs_callback = base::Bind(&NetPrefObserver::ApplySettings, 26 base::Closure prefs_callback = base::Bind(&NetPrefObserver::ApplySettings,
28 base::Unretained(this)); 27 base::Unretained(this));
29 network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
30 prefs_callback);
31 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, prefs_callback); 28 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, prefs_callback);
32 29
33 ApplySettings(); 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::ApplySettings() { 37 void NetPrefObserver::ApplySettings() {
41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 38 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
42 39
43 if (prerender_manager_)
44 prerender_manager_->set_enabled(*network_prediction_enabled_);
45 if (spdy_disabled_.IsManaged()) 40 if (spdy_disabled_.IsManaged())
46 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); 41 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
47 } 42 }
48 43
49 // static 44 // static
50 void NetPrefObserver::RegisterProfilePrefs( 45 void NetPrefObserver::RegisterProfilePrefs(
51 user_prefs::PrefRegistrySyncable* registry) { 46 user_prefs::PrefRegistrySyncable* registry) {
52 registry->RegisterBooleanPref( 47 registry->RegisterBooleanPref(
53 prefs::kNetworkPredictionEnabled, 48 prefs::kNetworkPredictionEnabled,
54 true, 49 true,
55 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 50 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
56 registry->RegisterBooleanPref( 51 registry->RegisterBooleanPref(
57 prefs::kDisableSpdy, 52 prefs::kDisableSpdy,
58 false, 53 false,
59 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 54 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
60 } 55 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698