| OLD | NEW |
| 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_registry_syncable.h" |
| 8 #include "chrome/browser/prefs/pref_service.h" | 9 #include "chrome/browser/prefs/pref_service.h" |
| 9 #include "chrome/browser/prerender/prerender_manager.h" | 10 #include "chrome/browser/prerender/prerender_manager.h" |
| 10 #include "chrome/common/chrome_notification_types.h" | 11 #include "chrome/common/chrome_notification_types.h" |
| 11 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
| 12 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
| 13 #include "net/http/http_stream_factory.h" | 14 #include "net/http/http_stream_factory.h" |
| 14 | 15 |
| 15 using content::BrowserThread; | 16 using content::BrowserThread; |
| 16 | 17 |
| 17 NetPrefObserver::NetPrefObserver(PrefService* prefs, | 18 NetPrefObserver::NetPrefObserver(PrefService* prefs, |
| (...skipping 22 matching lines...) Expand all Loading... |
| 40 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 41 | 42 |
| 42 predictor_->EnablePredictor(*network_prediction_enabled_); | 43 predictor_->EnablePredictor(*network_prediction_enabled_); |
| 43 if (prerender_manager_) | 44 if (prerender_manager_) |
| 44 prerender_manager_->set_enabled(*network_prediction_enabled_); | 45 prerender_manager_->set_enabled(*network_prediction_enabled_); |
| 45 if (spdy_disabled_.IsManaged()) | 46 if (spdy_disabled_.IsManaged()) |
| 46 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); | 47 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); |
| 47 } | 48 } |
| 48 | 49 |
| 49 // static | 50 // static |
| 50 void NetPrefObserver::RegisterUserPrefs(PrefServiceSyncable* prefs) { | 51 void NetPrefObserver::RegisterUserPrefs(PrefRegistrySyncable* registry) { |
| 51 prefs->RegisterBooleanPref(prefs::kNetworkPredictionEnabled, | 52 registry->RegisterBooleanPref(prefs::kNetworkPredictionEnabled, |
| 52 true, | 53 true, |
| 53 PrefServiceSyncable::SYNCABLE_PREF); | 54 PrefRegistrySyncable::SYNCABLE_PREF); |
| 54 prefs->RegisterBooleanPref(prefs::kDisableSpdy, | 55 registry->RegisterBooleanPref(prefs::kDisableSpdy, |
| 55 false, | 56 false, |
| 56 PrefServiceSyncable::UNSYNCABLE_PREF); | 57 PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 57 } | 58 } |
| OLD | NEW |