Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Side by Side Diff: chrome_frame/test/navigation_test.cc

Issue 15944007: Fix cross-window focus in Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: only open popups once Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/test/ie_event_sink.cc ('k') | chrome_frame/test/simulate_input.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/test/test_file_util.h" 8 #include "base/test/test_file_util.h"
9 #include "base/win/scoped_comptr.h" 9 #include "base/win/scoped_comptr.h"
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 .Times(1) 362 .Times(1)
363 .WillOnce(CloseBrowserMock(&ie_mock_)); 363 .WillOnce(CloseBrowserMock(&ie_mock_));
364 364
365 // OnNavigateError can take a long time to fire. 365 // OnNavigateError can take a long time to fire.
366 LaunchIENavigateAndLoop(parent_url, kChromeFrameLongNavigationTimeout * 4); 366 LaunchIENavigateAndLoop(parent_url, kChromeFrameLongNavigationTimeout * 4);
367 ASSERT_TRUE(new_window_mock.event_sink()->web_browser2() != NULL); 367 ASSERT_TRUE(new_window_mock.event_sink()->web_browser2() != NULL);
368 } 368 }
369 369
370 // Tests that the parent window can successfully close its popup through 370 // Tests that the parent window can successfully close its popup through
371 // the javascript close method. 371 // the javascript close method.
372 #if defined(USE_AURA)
373 // Key events don't work after window.open; http://crbug.com/241081.
374 TEST_P(FullTabNavigationTest, DISABLED_JavascriptWindowOpenCanClose) {
375 #else
376 TEST_P(FullTabNavigationTest, JavascriptWindowOpenCanClose) { 372 TEST_P(FullTabNavigationTest, JavascriptWindowOpenCanClose) {
377 #endif
378 // Please see http://code.google.com/p/chromium/issues/detail?id=60987 373 // Please see http://code.google.com/p/chromium/issues/detail?id=60987
379 // for more information on why this test is disabled for Vista with IE7. 374 // for more information on why this test is disabled for Vista with IE7.
380 if (base::win::GetVersion() == base::win::VERSION_VISTA && 375 if (base::win::GetVersion() == base::win::VERSION_VISTA &&
381 GetInstalledIEVersion() == IE_7) { 376 GetInstalledIEVersion() == IE_7) {
382 LOG(INFO) << "Not running test on Vista with IE7"; 377 LOG(INFO) << "Not running test on Vista with IE7";
383 return; 378 return;
384 } 379 }
385 380
386 std::wstring parent_url = GetWindowOpenUrl(L"simple.html"); 381 std::wstring parent_url = GetWindowOpenUrl(L"simple.html");
387 MockAccEventObserver acc_observer; 382 MockAccEventObserver acc_observer;
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
1287 .WillOnce(CloseBrowserMock( 1282 .WillOnce(CloseBrowserMock(
1288 &no_referrer_target_opener_window_mock)); 1283 &no_referrer_target_opener_window_mock));
1289 1284
1290 EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit()) 1285 EXPECT_CALL(no_referrer_target_opener_window_mock, OnQuit())
1291 .WillOnce(CloseBrowserMock(&ie_mock_)); 1286 .WillOnce(CloseBrowserMock(&ie_mock_));
1292 1287
1293 LaunchIENavigateAndLoop(initial_url, kChromeFrameVeryLongNavigationTimeout); 1288 LaunchIENavigateAndLoop(initial_url, kChromeFrameVeryLongNavigationTimeout);
1294 } 1289 }
1295 1290
1296 } // namespace chrome_frame_test 1291 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome_frame/test/ie_event_sink.cc ('k') | chrome_frame/test/simulate_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698