| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chromeos/net/proxy_config_handler.h" | 5 #include "chrome/browser/chromeos/net/proxy_config_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/prefs/pref_registry_simple.h" | 10 #include "base/prefs/pref_registry_simple.h" |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 network.path(), | 123 network.path(), |
| 124 network_handler::ErrorCallback())); | 124 network_handler::ErrorCallback())); |
| 125 } | 125 } |
| 126 } | 126 } |
| 127 | 127 |
| 128 void RegisterPrefs(PrefRegistrySimple* registry) { | 128 void RegisterPrefs(PrefRegistrySimple* registry) { |
| 129 registry->RegisterListPref(prefs::kDeviceOpenNetworkConfiguration); | 129 registry->RegisterListPref(prefs::kDeviceOpenNetworkConfiguration); |
| 130 } | 130 } |
| 131 | 131 |
| 132 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { | 132 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
| 133 registry->RegisterBooleanPref( | 133 registry->RegisterBooleanPref(prefs::kUseSharedProxies, false); |
| 134 prefs::kUseSharedProxies, | |
| 135 false, | |
| 136 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
| 137 | 134 |
| 138 registry->RegisterListPref(prefs::kOpenNetworkConfiguration, | 135 registry->RegisterListPref(prefs::kOpenNetworkConfiguration); |
| 139 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
| 140 } | 136 } |
| 141 | 137 |
| 142 } // namespace proxy_config | 138 } // namespace proxy_config |
| 143 | 139 |
| 144 } // namespace chromeos | 140 } // namespace chromeos |
| OLD | NEW |