diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 21:41:42 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 21:41:42 +0000 |
| commit | 77ac540e3bc5794d01f1adfdb8292231f5e28896 (patch) | |
| tree | 3625b06bf805b49e5750061fd6bee0b4e53db83f /chrome/browser/chromeos/net/proxy_config_handler.cc | |
| parent | bb8f8126ef3afb7744c4176df18cce2257a9225b (diff) | |
| download | chromium_src-77ac540e3bc5794d01f1adfdb8292231f5e28896.zip chromium_src-77ac540e3bc5794d01f1adfdb8292231f5e28896.tar.gz chromium_src-77ac540e3bc5794d01f1adfdb8292231f5e28896.tar.bz2 | |
Clean up shill error handling
BUG=none
R=gspencer@chromium.org
Review URL: https://codereview.chromium.org/18344015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/net/proxy_config_handler.cc')
| -rw-r--r-- | chrome/browser/chromeos/net/proxy_config_handler.cc | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/chrome/browser/chromeos/net/proxy_config_handler.cc b/chrome/browser/chromeos/net/proxy_config_handler.cc index b1d2f1e..013fb44 100644 --- a/chrome/browser/chromeos/net/proxy_config_handler.cc +++ b/chrome/browser/chromeos/net/proxy_config_handler.cc @@ -19,20 +19,6 @@ namespace chromeos { -namespace { - -void LogError(const std::string& network, - const std::string& error_name, - const std::string& error_message) { - network_handler::ShillErrorCallbackFunction( - network, - network_handler::ErrorCallback(), - "Could not clear or set ProxyConfig", - error_message); -} - -} // namespace - namespace proxy_config { scoped_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork( @@ -56,7 +42,9 @@ void SetProxyConfigForNetwork(const ProxyConfigDictionary& proxy_config, dbus::ObjectPath(network.path()), flimflam::kProxyConfigProperty, base::Bind(&base::DoNothing), - base::Bind(&LogError, network.path())); + base::Bind(&network_handler::ShillErrorCallbackFunction, + "SetProxyConfig.ClearProperty Failed", + network.path(), network_handler::ErrorCallback())); } else { std::string proxy_config_str; base::JSONWriter::Write(&proxy_config.GetDictionary(), &proxy_config_str); @@ -65,7 +53,9 @@ void SetProxyConfigForNetwork(const ProxyConfigDictionary& proxy_config, flimflam::kProxyConfigProperty, base::StringValue(proxy_config_str), base::Bind(&base::DoNothing), - base::Bind(&LogError, network.path())); + base::Bind(&network_handler::ShillErrorCallbackFunction, + "SetProxyConfig.SetProperty Failed", + network.path(), network_handler::ErrorCallback())); } if (NetworkHandler::IsInitialized()) { |