diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 18:04:27 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 18:04:27 +0000 |
commit | 2f1449ba88018021979f73073fc1f8a85c5bf02b (patch) | |
tree | 150772bbbb75bd922808245c4b70df253bd0fbf1 /chrome/browser/net | |
parent | bbbc1ef9d160f602aed88ed2eecd6063e5952ca7 (diff) | |
download | chromium_src-2f1449ba88018021979f73073fc1f8a85c5bf02b.zip chromium_src-2f1449ba88018021979f73073fc1f8a85c5bf02b.tar.gz chromium_src-2f1449ba88018021979f73073fc1f8a85c5bf02b.tar.bz2 |
Pass NetworkChangeNotifier to ProxyService so it gets network change notifications.
BUG=12293
Review URL: http://codereview.chromium.org/596074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 3faa8d3..2afff1d 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -80,6 +80,7 @@ net::ProxyConfigService* CreateProxyConfigService( // Create a proxy service according to the options on command line. net::ProxyService* CreateProxyService( + net::NetworkChangeNotifier* network_change_notifier, URLRequestContext* context, net::ProxyConfigService* proxy_config_service, const CommandLine& command_line, @@ -98,8 +99,7 @@ net::ProxyService* CreateProxyService( proxy_config_service, use_v8, context, - NULL, // TODO(eroman): Pass a valid NetworkChangeNotifier implementation - // (http://crbug.com/12293). + network_change_notifier, io_loop); } @@ -146,7 +146,8 @@ ChromeURLRequestContext* FactoryForOriginal::Create() { const CommandLine& command_line = *CommandLine::ForCurrentProcess(); context->set_proxy_service( - CreateProxyService(context, + CreateProxyService(io_thread()->globals()->network_change_notifier.get(), + context, proxy_config_service_.release(), command_line, MessageLoop::current() /*io_loop*/)); |