diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-05 19:51:07 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-05 19:51:07 +0000 |
| commit | 0a43e4f384f713c81d73db75fb58bd6ce60b8ca3 (patch) | |
| tree | 1170b2d264f4af092ecab21c6f5a4f66f0e3f1fb /chrome/browser/renderer_host | |
| parent | d6ad744a51007d532f49081e3ba7936f31e337a3 (diff) | |
| download | chromium_src-0a43e4f384f713c81d73db75fb58bd6ce60b8ca3.zip chromium_src-0a43e4f384f713c81d73db75fb58bd6ce60b8ca3.tar.gz chromium_src-0a43e4f384f713c81d73db75fb58bd6ce60b8ca3.tar.bz2 | |
Fix ChromeFrame tests which regressed due to the change to connect when navigation starts.
The preconnection code uses the chrome http stack which breaks chrome frame which uses
the host network stack.
The fix is to bypass this code if the current RenderViewHostDelegate is an ExternalTabContainer.
TBR=mbelshe
Review URL: http://codereview.chromium.org/3360010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/render_view_host.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 66a462d..10e285c 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -264,7 +264,8 @@ void RenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) { delegate_->DidStartLoading(); const GURL& url = params.url; - if (url.SchemeIs("http") || url.SchemeIs("https")) + if (!delegate_->IsExternalTabContainer() && + url.SchemeIs("http") || url.SchemeIs("https")) chrome_browser_net::PreconnectUrlAndSubresources(url); } } |