summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/navigation_test.cc
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 13:58:22 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-25 13:58:22 +0000
commit2b5034075bce34d79aa716eb6525f6bc43b26777 (patch)
treed90179252d64793b14d903c98bd404ddb9bbb651 /chrome_frame/test/navigation_test.cc
parentf958054738592c984e713a2582ac66d0e9bd5b4c (diff)
downloadchromium_src-2b5034075bce34d79aa716eb6525f6bc43b26777.zip
chromium_src-2b5034075bce34d79aa716eb6525f6bc43b26777.tar.gz
chromium_src-2b5034075bce34d79aa716eb6525f6bc43b26777.tar.bz2
Fix cross-window focus in Chrome Frame.
Text input wasn't working due to requirements of the IME/TSF machinery that weren't being met by ExternalTabContainerWin. * ExternalTabContainerWin now provides an implementation for WebContentsDelegate::WebContentsFocused that calls into its WebView's OnWebContentsFocused method. This mimics BrowserView, and permits proper focus tracking via the FocusManager. * ExternalTabContainerWin now provides a specialization of DesktopRootWindowHostWin that saves and restores focus on blur/focus events. The stock DRWHW does this based on window activation, but this doesn't work for ETCW since the ETCW's DRWHW doesn't receive activation messages due to it being a child of an IE window rather than a top-level window. * IEEventSink::SendKeys now sets focus to the renderer before sending key down/up messages. BUG=241081 Review URL: https://chromiumcodereview.appspot.com/15944007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/navigation_test.cc')
-rw-r--r--chrome_frame/test/navigation_test.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome_frame/test/navigation_test.cc b/chrome_frame/test/navigation_test.cc
index 50f9134..1f8485f 100644
--- a/chrome_frame/test/navigation_test.cc
+++ b/chrome_frame/test/navigation_test.cc
@@ -369,12 +369,7 @@ TEST_P(FullTabNavigationTest, DISABLED_JavascriptWindowOpenDifferentDomain) {
// Tests that the parent window can successfully close its popup through
// the javascript close method.
-#if defined(USE_AURA)
-// Key events don't work after window.open; http://crbug.com/241081.
-TEST_P(FullTabNavigationTest, DISABLED_JavascriptWindowOpenCanClose) {
-#else
TEST_P(FullTabNavigationTest, JavascriptWindowOpenCanClose) {
-#endif
// Please see http://code.google.com/p/chromium/issues/detail?id=60987
// for more information on why this test is disabled for Vista with IE7.
if (base::win::GetVersion() == base::win::VERSION_VISTA &&