diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 14:47:21 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 14:47:21 +0000 |
| commit | db0e86dde97e9b1ced5cba1c6a6c0cf29179db1b (patch) | |
| tree | 05b12196fd6fb91c63e554029eccc87016f741fb /chrome/browser/chromeos/proxy_config_service_impl.h | |
| parent | b8dedffcd73166ff70163162a713a2c0407953d6 (diff) | |
| download | chromium_src-db0e86dde97e9b1ced5cba1c6a6c0cf29179db1b.zip chromium_src-db0e86dde97e9b1ced5cba1c6a6c0cf29179db1b.tar.gz chromium_src-db0e86dde97e9b1ced5cba1c6a6c0cf29179db1b.tar.bz2 | |
This is an extension of http://codereview.chromium.org/6280018 that provides a proxy configuration which respects command line parameters and policies
This was committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=78228, iyengar asked to commit again after fixing trunk.
BUG=67232,70732
TEST=Start chrome, observe two PROXY_CONFIG_CHANGED events in about:net-internals (if you are on a corporate network with PAC configurations), observe that everything behaves as usual. In particular the https://www.google.com/searchdomaincheck?format=domain&type=chrome request should not fail as it uses the new system URLRequestContext.
Review URL: http://codereview.chromium.org/6292017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/proxy_config_service_impl.h')
| -rw-r--r-- | chrome/browser/chromeos/proxy_config_service_impl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h index 44a5166..99e50b03 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.h +++ b/chrome/browser/chromeos/proxy_config_service_impl.h @@ -39,9 +39,9 @@ class ProxyConfigServiceImpl public SignedSettings::Delegate<std::string> { public: // ProxyConfigServiceImpl is created on the UI thread in - // chrome/browser/net/chrome_url_request_context.cc::CreateProxyConfigService - // via ProfileImpl::GetChromeOSProxyConfigServiceImpl, and stored in Profile - // as a scoped_refptr (because it's RefCountedThreadSafe). + // chrome/browser/net/proxy_service_factory.cc::CreateProxyConfigService + // via BrowserProcess::chromeos_proxy_config_service_impl, and stored in + // g_browser_process as a scoped_refptr (because it's RefCountedThreadSafe). // // Past that point, it can be accessed from the IO or UI threads. // @@ -50,7 +50,7 @@ class ProxyConfigServiceImpl // (GetLatestProxyConfig, AddObserver, RemoveObserver). // // From the UI thread, it is accessed via - // WebUI::GetProfile::GetChromeOSProxyConfigServiceImpl to allow user to read + // BrowserProcess::chromeos_proxy_config_service_impl to allow user to read // or modify the proxy configuration via UIGetProxyConfig or // UISetProxyConfigTo* respectively. // The new modified proxy config is posted to the IO thread through |