summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-14 21:42:06 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-14 21:42:06 +0000
commitcdcf18b0b4a7218e6053e3636b5038c679767528 (patch)
treed965289475e0bba117442b1b71a3a2273c6ee553 /chrome_frame
parente5f7c33fd248ce3443645b9a2f7a25624ad75188 (diff)
downloadchromium_src-cdcf18b0b4a7218e6053e3636b5038c679767528.zip
chromium_src-cdcf18b0b4a7218e6053e3636b5038c679767528.tar.gz
chromium_src-cdcf18b0b4a7218e6053e3636b5038c679767528.tar.bz2
Add an intermediate window between GCF's host window and the RHW.
Previously, GCF+Aura parented the ChromeFrameAutomationClient window directly to the DesktopRootWindowHostWin window. This caused some focus warping (and possibly other) issues when SetParent was called again. BUG=235411 Review URL: https://chromiumcodereview.appspot.com/14927013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/ui_test.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index 2342ca3..66a6fcf 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -360,12 +360,7 @@ void NavigateToCurrentUrl(MockIEEventSink* mock) {
// Tests that Chrome gets re-instantiated after crash if we reload via
// the address bar or via a new navigation.
-#if defined(USE_AURA)
-// Renderer doesn't have focus; see http://crbug.com/235411.
-TEST_P(FullTabUITest, DISABLED_TabCrashReload) {
-#else
TEST_P(FullTabUITest, TabCrashReload) {
-#endif
using testing::DoAll;
if (!GetParam().invokes_cf()) {