summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/data
diff options
context:
space:
mode:
authorericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-12 20:50:11 +0000
committerericu@google.com <ericu@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-12 20:50:11 +0000
commit502415277b63821cc18422e177b73de41985bec6 (patch)
tree9625e2de0cef611528ee73b2f8d43c1a58245e7f /chrome_frame/test/data
parent15d8edb4918b3729fc72200f5c19a67409fc0180 (diff)
downloadchromium_src-502415277b63821cc18422e177b73de41985bec6.zip
chromium_src-502415277b63821cc18422e177b73de41985bec6.tar.gz
chromium_src-502415277b63821cc18422e177b73de41985bec6.tar.bz2
Reverting due to two broken tests: FullTabModeIE_SubIFram and FullTabModeIE_UnloadEventTest.
Revert 41463 - When ChromeFrame switches to IE on receiving the OnHttpEquiv notification indicating the presence of a meta tag indicating that the page is to be rendered in Chrome, we check if the notification is received for a site rendered in an IFrame to ensure that we don't switch in this case. This code is not reliable and we end up assuming that a top level navigation is actually an embedded frame. To work around this we now maintain a pending navigation count in BeforeNavigate2, which is decremented in NavigateComplete2 and NavigateError. We perform the check for an embedded document only if the pending navigation count is greater than 1. This fixes http://code.google.com/p/chromium/issues/detail?id=36825 The other change made is to add a delay of 100ms in SendString between each character to better reflect actual timing for real user input. Bug=36825 Review URL: http://codereview.chromium.org/837008 TBR=ananta@chromium.org Review URL: http://codereview.chromium.org/877009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/data')
-rw-r--r--chrome_frame/test/data/host_browser.html8
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome_frame/test/data/host_browser.html b/chrome_frame/test/data/host_browser.html
deleted file mode 100644
index cfd21f4..0000000
--- a/chrome_frame/test/data/host_browser.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
- <head><title>Initial Page in host browser</title>
- </head>
- <body onLoad="test();">
- <h2>Initial page in host browser!</h2>
- <p>This page should have loaded in the host browser.</p>
- </body>
-</html>