| OLD | NEW |
| 1 // Copyright (c) 2011 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/prefs/pref_service.h" | 8 #include "chrome/browser/prefs/pref_service.h" |
| 9 #include "chrome/browser/prefs/pref_set_observer.h" | 9 #include "chrome/browser/prefs/pref_set_observer.h" |
| 10 #include "chrome/browser/prefs/proxy_config_dictionary.h" | 10 #include "chrome/browser/prefs/proxy_config_dictionary.h" |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 if (!registered_observers_) { | 262 if (!registered_observers_) { |
| 263 base_service_->AddObserver(this); | 263 base_service_->AddObserver(this); |
| 264 pref_config_tracker_->AddObserver(this); | 264 pref_config_tracker_->AddObserver(this); |
| 265 registered_observers_ = true; | 265 registered_observers_ = true; |
| 266 } | 266 } |
| 267 } | 267 } |
| 268 | 268 |
| 269 // static | 269 // static |
| 270 void PrefProxyConfigService::RegisterPrefs(PrefService* pref_service) { | 270 void PrefProxyConfigService::RegisterPrefs(PrefService* pref_service) { |
| 271 DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem(); | 271 DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem(); |
| 272 pref_service->RegisterDictionaryPref(prefs::kProxy, default_settings); | 272 pref_service->RegisterDictionaryPref(prefs::kProxy, |
| 273 default_settings, |
| 274 PrefService::UNSYNCABLE_PREF); |
| 273 } | 275 } |
| OLD | NEW |