diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 15:09:58 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-10 15:09:58 +0000 |
| commit | 9da3e45a10115c7593b53ed27069387209f9fe28 (patch) | |
| tree | 7d49ad6e8a3bfd0c4c03f48df8b5e5ccbcc31329 /chromeos | |
| parent | c14c2ace8823c52b65f4a698428407e3e7cd9283 (diff) | |
| download | chromium_src-9da3e45a10115c7593b53ed27069387209f9fe28.zip chromium_src-9da3e45a10115c7593b53ed27069387209f9fe28.tar.gz chromium_src-9da3e45a10115c7593b53ed27069387209f9fe28.tar.bz2 | |
Extract common per-network proxy configuration functions.
- Extracted functions to get and set per-network proxy configuration from ProxyConfigServiceImpl, UIProxyConfigService and NetworkStateInformer, and moved them to a common place (chrome/browser/chromeos/net/proxy_config_handler.h).
- The previous SetProxyConfig call to NetworkLibrary was extracted and instead ShillServiceClient is called directly.
- Now uses NetworkStateHandler and NetworkState instead of NetworkLibrary to get the current proxy config.
- This removed any dependency of proxy UI on NetworkLibrary.
BUG=234982
R=mnissler@chromium.org, nkostylev@chromium.org, stevenjb@chromium.org
Review URL: https://codereview.chromium.org/16398005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/network/network_handler_callbacks.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chromeos/network/network_handler_callbacks.h b/chromeos/network/network_handler_callbacks.h index 8caf804..2e73d28 100644 --- a/chromeos/network/network_handler_callbacks.h +++ b/chromeos/network/network_handler_callbacks.h @@ -39,10 +39,11 @@ CHROMEOS_EXPORT base::DictionaryValue* CreateErrorData( // Callback for Shill errors. |path| may be blank if not relevant. // Logs an error and calls |error_callback| if not null. -void ShillErrorCallbackFunction(const std::string& path, - const ErrorCallback& error_callback, - const std::string& error_name, - const std::string& error_message); +CHROMEOS_EXPORT void ShillErrorCallbackFunction( + const std::string& path, + const ErrorCallback& error_callback, + const std::string& error_name, + const std::string& error_message); } // namespace network_handler } // namespace chromeos |