diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 20:01:44 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 20:01:44 +0000 |
| commit | 01669fcb4ad36765847d9520484bfc16a0e6ab27 (patch) | |
| tree | 6d813bb0133eb12a5d18962989288480ca3e23cc | |
| parent | 49430f6d66ec71eddecb4ee958f220a1cebf6cca (diff) | |
| download | chromium_src-01669fcb4ad36765847d9520484bfc16a0e6ab27.zip chromium_src-01669fcb4ad36765847d9520484bfc16a0e6ab27.tar.gz chromium_src-01669fcb4ad36765847d9520484bfc16a0e6ab27.tar.bz2 | |
Disable the proxy redirect check for Chrome Frame.
This is the simplest way I could think of to disable this service for GCF but I'm open to other suggestions.
TEST=Make sure we still detect redirecting proxies in Chrome - there should be no change. For Chrome Frame however, we should not be issuing requests like described in the associated bug.
BUG=58126
Review URL: http://codereview.chromium.org/4419001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65103 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/intranet_redirect_detector.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index 481e8cf..46fd8be 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc @@ -80,8 +80,10 @@ void IntranetRedirectDetector::StartFetchesIfPossible() { if (in_sleep_ || !request_context_available_) return; - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableBackgroundNetworking)) + // The detector is not needed in Chrome Frame since we have no omnibox there. + const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); + if (cmd_line->HasSwitch(switches::kDisableBackgroundNetworking) || + cmd_line->HasSwitch(switches::kChromeFrame)) return; DCHECK(fetchers_.empty() && resulting_origins_.empty()); |