| 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 "base/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "chrome/browser/net/predictor.h" | 8 #include "chrome/browser/net/predictor.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 30 matching lines...) Expand all Loading... |
| 41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 42 | 42 |
| 43 predictor_->EnablePredictor(*network_prediction_enabled_); | 43 predictor_->EnablePredictor(*network_prediction_enabled_); |
| 44 if (prerender_manager_) | 44 if (prerender_manager_) |
| 45 prerender_manager_->set_enabled(*network_prediction_enabled_); | 45 prerender_manager_->set_enabled(*network_prediction_enabled_); |
| 46 if (spdy_disabled_.IsManaged()) | 46 if (spdy_disabled_.IsManaged()) |
| 47 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); | 47 net::HttpStreamFactory::set_spdy_enabled(!*spdy_disabled_); |
| 48 } | 48 } |
| 49 | 49 |
| 50 // static | 50 // static |
| 51 void NetPrefObserver::RegisterUserPrefs( | 51 void NetPrefObserver::RegisterProfilePrefs( |
| 52 user_prefs::PrefRegistrySyncable* registry) { | 52 user_prefs::PrefRegistrySyncable* registry) { |
| 53 registry->RegisterBooleanPref( | 53 registry->RegisterBooleanPref( |
| 54 prefs::kNetworkPredictionEnabled, | 54 prefs::kNetworkPredictionEnabled, |
| 55 true, | 55 true, |
| 56 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 56 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 57 registry->RegisterBooleanPref( | 57 registry->RegisterBooleanPref( |
| 58 prefs::kDisableSpdy, | 58 prefs::kDisableSpdy, |
| 59 false, | 59 false, |
| 60 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 60 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 61 } | 61 } |
| OLD | NEW |