| 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/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" | 
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 120         shill::kProxyConfigProperty, | 120         shill::kProxyConfigProperty, | 
| 121         base::StringValue(proxy_config_str), | 121         base::StringValue(proxy_config_str), | 
| 122         base::Bind(&NotifyNetworkStateHandler, network.path()), | 122         base::Bind(&NotifyNetworkStateHandler, network.path()), | 
| 123         base::Bind(&network_handler::ShillErrorCallbackFunction, | 123         base::Bind(&network_handler::ShillErrorCallbackFunction, | 
| 124                    "SetProxyConfig.SetProperty Failed", | 124                    "SetProxyConfig.SetProperty Failed", | 
| 125                    network.path(), | 125                    network.path(), | 
| 126                    network_handler::ErrorCallback())); | 126                    network_handler::ErrorCallback())); | 
| 127   } | 127   } | 
| 128 } | 128 } | 
| 129 | 129 | 
| 130 void RegisterPrefs(PrefRegistrySimple* registry) { |  | 
| 131   registry->RegisterListPref(prefs::kDeviceOpenNetworkConfiguration); |  | 
| 132 } |  | 
| 133 |  | 
| 134 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |  | 
| 135   registry->RegisterBooleanPref(prefs::kUseSharedProxies, false); |  | 
| 136 |  | 
| 137   registry->RegisterListPref(prefs::kOpenNetworkConfiguration); |  | 
| 138 } |  | 
| 139 |  | 
| 140 }  // namespace proxy_config | 130 }  // namespace proxy_config | 
| 141 | 131 | 
| 142 }  // namespace chromeos | 132 }  // namespace chromeos | 
| OLD | NEW | 
|---|