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/browser_process_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/browser_process_impl.h')
| -rw-r--r-- | chrome/browser/browser_process_impl.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index 4967f59..b7412a4 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -63,6 +63,11 @@ class BrowserProcessImpl : public BrowserProcess, virtual DevToolsManager* devtools_manager(); virtual SidebarManager* sidebar_manager(); virtual ui::Clipboard* clipboard(); + virtual URLRequestContextGetter* system_request_context(); +#if defined(OS_CHROMEOS) + virtual chromeos::ProxyConfigServiceImpl* + chromeos_proxy_config_service_impl(); +#endif // defined(OS_CHROMEOS) virtual ExtensionEventRouterForwarder* extension_event_router_forwarder(); virtual NotificationUIManager* notification_ui_manager(); virtual policy::BrowserPolicyConnector* browser_policy_connector(); @@ -275,6 +280,11 @@ class BrowserProcessImpl : public BrowserProcess, void RestartPersistentInstance(); #endif // defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_CHROMEOS) + scoped_refptr<chromeos::ProxyConfigServiceImpl> + chromeos_proxy_config_service_impl_; +#endif + DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); }; |