diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 18:42:51 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 18:42:51 +0000 |
commit | 86965365e32c24a7ebded07c85a21b0b439e3c46 (patch) | |
tree | f9366f7830848398b9df47a8b1ba9a8ba0c668d3 /content/renderer/render_view.cc | |
parent | 1a74e4952bc2f60f94ddbda644f6fe210faa52aa (diff) | |
download | chromium_src-86965365e32c24a7ebded07c85a21b0b439e3c46.zip chromium_src-86965365e32c24a7ebded07c85a21b0b439e3c46.tar.gz chromium_src-86965365e32c24a7ebded07c85a21b0b439e3c46.tar.bz2 |
Fix chrome frame tests which regressed after my change to only route content initiated navigations back to the
host browser. The regression occurred because of a check for whether the navigation type is link clicked, which
is not needed anymore.
Increased the timeout for ChromeFrameTestWithWebServer.FullTabModeIE_TestMultipleGet test which fails randomly on
my machine and on some of the builders.
BUG=none
TEST=ChromeFrame tests should now pass.
Review URL: http://codereview.chromium.org/6882104
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view.cc')
-rw-r--r-- | content/renderer/render_view.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 9d12cd4..d3c32f0 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -4165,10 +4165,7 @@ bool RenderView::IsNonLocalTopLevelNavigation( // top level navigation and routed back to the host. WebKit::WebFrame* opener = frame->opener(); if (!opener) { - // Force link click navigations to always be routed to the host as they - // may update session state on the server. - if (type == WebKit::WebNavigationTypeLinkClicked) - return true; + return true; } else { if (url.GetOrigin() != GURL(opener->url()).GetOrigin()) return true; |