diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 19:29:35 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 19:29:35 +0000 |
| commit | 29c003e0201f2da153af7964e13ad85d49dc31de (patch) | |
| tree | 7d05828de9127f8ba0263d3aeec02efef205b35c /net/proxy/proxy_config.cc | |
| parent | b8b14be5e64a4193009a5736b38aa41c979da267 (diff) | |
| download | chromium_src-29c003e0201f2da153af7964e13ad85d49dc31de.zip chromium_src-29c003e0201f2da153af7964e13ad85d49dc31de.tar.gz chromium_src-29c003e0201f2da153af7964e13ad85d49dc31de.tar.bz2 | |
Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.
- UI part of ProxyConfigServiceImpl is moved to UIProxyConfig and UIProxyConfigService.
- ProxyConfigServiceImpl uses NetworkStateHandler instead of NetworkLibrary except for the legacy migration of device proxy settings.
- UI code continues to use NetworkLibrary for now.
BUG=234982
TBR=willchan@chromium.org (for trivial but reviewed change in net/proxy/proxy_config.*)
Review URL: https://chromiumcodereview.appspot.com/14846004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config.cc')
| -rw-r--r-- | net/proxy/proxy_config.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_config.cc b/net/proxy/proxy_config.cc index 84b3d7a..f14b6dd 100644 --- a/net/proxy/proxy_config.cc +++ b/net/proxy/proxy_config.cc @@ -218,7 +218,7 @@ void ProxyConfig::ClearAutomaticSettings() { pac_url_ = GURL(); } -base::Value* ProxyConfig::ToValue() const { +base::DictionaryValue* ProxyConfig::ToValue() const { base::DictionaryValue* dict = new base::DictionaryValue(); // Output the automatic settings. |