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

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: Nits. 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
« no previous file with comments | « chrome/browser/net/net_pref_observer.h ('k') | chrome/browser/prerender/prerender_manager.h » ('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 "base/logging.h"
7 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/net/predictor.h"
10 #include "chrome/browser/prerender/prerender_manager.h"
11 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
12 #include "components/pref_registry/pref_registry_syncable.h" 11 #include "components/pref_registry/pref_registry_syncable.h"
13 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
14 #include "net/http/http_stream_factory.h" 13 #include "net/http/http_stream_factory.h"
15 14
16 using content::BrowserThread; 15 using content::BrowserThread;
17 16
18 NetPrefObserver::NetPrefObserver(PrefService* prefs, 17 NetPrefObserver::NetPrefObserver(PrefService* prefs) {
19 prerender::PrerenderManager* prerender_manager,
20 chrome_browser_net::Predictor* predictor)
21 : prerender_manager_(prerender_manager),
22 predictor_(predictor) {
23 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 18 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
24 DCHECK(prefs); 19 DCHECK(prefs);
25 DCHECK(predictor);
26 20
27 base::Closure prefs_callback = base::Bind(&NetPrefObserver::ApplySettings, 21 base::Closure prefs_callback = base::Bind(&NetPrefObserver::ApplySettings,
28 base::Unretained(this)); 22 base::Unretained(this));
29 network_prediction_enabled_.Init(prefs::kNetworkPredictionEnabled, prefs,
30 prefs_callback);
31 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, prefs_callback); 23 spdy_disabled_.Init(prefs::kDisableSpdy, prefs, prefs_callback);
32 24
33 ApplySettings(); 25 ApplySettings();
34 } 26 }
35 27
36 NetPrefObserver::~NetPrefObserver() { 28 NetPrefObserver::~NetPrefObserver() {
37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 29 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
38 } 30 }
39 31
40 void NetPrefObserver::ApplySettings() { 32 void NetPrefObserver::ApplySettings() {
41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 33 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
42 34
43 if (prerender_manager_)
44 prerender_manager_->set_enabled(*network_prediction_enabled_);
45 if (spdy_disabled_.IsManaged()) 35 if (spdy_disabled_.IsManaged())
46 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); 36 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_);
47 } 37 }
48 38
49 // static 39 // static
50 void NetPrefObserver::RegisterProfilePrefs( 40 void NetPrefObserver::RegisterProfilePrefs(
51 user_prefs::PrefRegistrySyncable* registry) { 41 user_prefs::PrefRegistrySyncable* registry) {
52 registry->RegisterBooleanPref( 42 registry->RegisterBooleanPref(
53 prefs::kNetworkPredictionEnabled, 43 prefs::kNetworkPredictionEnabled,
54 true, 44 true,
55 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 45 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
56 registry->RegisterBooleanPref( 46 registry->RegisterBooleanPref(
57 prefs::kDisableSpdy, 47 prefs::kDisableSpdy,
58 false, 48 false,
59 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 49 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
60 } 50 }
OLDNEW
« no previous file with comments | « chrome/browser/net/net_pref_observer.h ('k') | chrome/browser/prerender/prerender_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698