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_cros_settings_provider.cc | |
| 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_cros_settings_provider.cc')
| -rw-r--r-- | chrome/browser/chromeos/proxy_cros_settings_provider.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/proxy_cros_settings_provider.cc b/chrome/browser/chromeos/proxy_cros_settings_provider.cc index 78489a1..ccb3e44 100644 --- a/chrome/browser/chromeos/proxy_cros_settings_provider.cc +++ b/chrome/browser/chromeos/proxy_cros_settings_provider.cc @@ -7,8 +7,7 @@ #include "base/command_line.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/profiles/profile.h" -#include "chrome/browser/profiles/profile_manager.h" +#include "chrome/browser/browser_process.h" #include "chrome/common/chrome_switches.h" namespace chromeos { @@ -292,12 +291,7 @@ bool ProxyCrosSettingsProvider::HandlesSetting(const std::string& path) { chromeos::ProxyConfigServiceImpl* ProxyCrosSettingsProvider::GetConfigService() const { - Browser* browser = BrowserList::GetLastActive(); - // browser is NULL at OOBE/login stage. - Profile* profile = browser ? - browser->profile() : - ProfileManager::GetDefaultProfile(); - return profile->GetChromeOSProxyConfigServiceImpl(); + return g_browser_process->chromeos_proxy_config_service_impl(); } void ProxyCrosSettingsProvider::AppendPortIfValid( |