OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/pref_proxy_config_service.h" | 5 #include "chrome/browser/net/pref_proxy_config_service.h" |
6 | 6 |
7 #include "base/values.h" | 7 #include "base/values.h" |
8 #include "chrome/browser/browser_thread.h" | 8 #include "chrome/browser/browser_thread.h" |
9 #include "chrome/browser/prefs/pref_service.h" | 9 #include "chrome/browser/prefs/pref_service.h" |
10 #include "chrome/browser/prefs/pref_set_observer.h" | 10 #include "chrome/browser/prefs/pref_set_observer.h" |
11 #include "chrome/browser/prefs/proxy_config_dictionary.h" | 11 #include "chrome/browser/prefs/proxy_config_dictionary.h" |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 void PrefProxyConfigService::RegisterObservers() { | 219 void PrefProxyConfigService::RegisterObservers() { |
220 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 220 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
221 if (!registered_observers_) { | 221 if (!registered_observers_) { |
222 base_service_->AddObserver(this); | 222 base_service_->AddObserver(this); |
223 pref_config_tracker_->AddObserver(this); | 223 pref_config_tracker_->AddObserver(this); |
224 registered_observers_ = true; | 224 registered_observers_ = true; |
225 } | 225 } |
226 } | 226 } |
227 | 227 |
228 // static | 228 // static |
229 void PrefProxyConfigService::RegisterUserPrefs( | 229 void PrefProxyConfigService::RegisterPrefs(PrefService* pref_service) { |
230 PrefService* pref_service) { | |
231 DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem(); | 230 DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem(); |
232 pref_service->RegisterDictionaryPref(prefs::kProxy, default_settings); | 231 pref_service->RegisterDictionaryPref(prefs::kProxy, default_settings); |
233 } | 232 } |
OLD | NEW |