| 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/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/prefs/pref_service.h" | |
| 10 #include "chrome/common/pref_names.h" | 9 #include "chrome/common/pref_names.h" |
| 11 #include "components/pref_registry/pref_registry_syncable.h" | 10 #include "components/pref_registry/pref_registry_syncable.h" |
| 11 #include "components/prefs/pref_service.h" |
| 12 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
| 13 #include "net/http/http_stream_factory.h" | 13 #include "net/http/http_stream_factory.h" |
| 14 | 14 |
| 15 using content::BrowserThread; | 15 using content::BrowserThread; |
| 16 | 16 |
| 17 NetPrefObserver::NetPrefObserver(PrefService* prefs) { | 17 NetPrefObserver::NetPrefObserver(PrefService* prefs) { |
| 18 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 18 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 19 DCHECK(prefs); | 19 DCHECK(prefs); |
| 20 | 20 |
| 21 base::Closure prefs_callback = base::Bind(&NetPrefObserver::ApplySettings, | 21 base::Closure prefs_callback = base::Bind(&NetPrefObserver::ApplySettings, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 // static | 39 // static |
| 40 void NetPrefObserver::RegisterProfilePrefs( | 40 void NetPrefObserver::RegisterProfilePrefs( |
| 41 user_prefs::PrefRegistrySyncable* registry) { | 41 user_prefs::PrefRegistrySyncable* registry) { |
| 42 registry->RegisterBooleanPref( | 42 registry->RegisterBooleanPref( |
| 43 prefs::kNetworkPredictionEnabled, | 43 prefs::kNetworkPredictionEnabled, |
| 44 true, | 44 true, |
| 45 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 45 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); |
| 46 registry->RegisterBooleanPref(prefs::kDisableSpdy, false); | 46 registry->RegisterBooleanPref(prefs::kDisableSpdy, false); |
| 47 } | 47 } |
| OLD | NEW |