diff options
| author | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 18:08:17 +0000 |
|---|---|---|
| committer | robertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 18:08:17 +0000 |
| commit | a7eee32f5e2250e5bf8d2b47612e9de140a7e850 (patch) | |
| tree | f2566d8b303f7bfce163023218424b701af95b65 /net/proxy/proxy_service.cc | |
| parent | 8538894e63ccd5239049484737fb4b819fe49bad (diff) | |
| download | chromium_src-a7eee32f5e2250e5bf8d2b47612e9de140a7e850.zip chromium_src-a7eee32f5e2250e5bf8d2b47612e9de140a7e850.tar.gz chromium_src-a7eee32f5e2250e5bf8d2b47612e9de140a7e850.tar.bz2 | |
Re-do of r16741 (http://codereview.chromium.org/113482).
Moved the new automation message in automation_messages_internal.h to the END of the enum as per the large scary warning that I skillfully missed last time around.
TBR=amit
Review URL: http://codereview.chromium.org/115711
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
| -rw-r--r-- | net/proxy/proxy_service.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index a827389..65db636 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -518,6 +518,12 @@ void ProxyService::SetProxyScriptFetcher( proxy_script_fetcher_.reset(proxy_script_fetcher); } +void ProxyService::ResetConfigService( + ProxyConfigService* new_proxy_config_service) { + config_service_.reset(new_proxy_config_service); + UpdateConfig(); +} + void ProxyService::DidCompletePacRequest(int config_id, int result_code) { // If we get an error that indicates a bad PAC config, then we should // remember that, and not try the PAC config again for a while. |