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

Side by Side Diff: chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

Issue 900893003: Revert "Disable PopupBlockerBrowserTest.CtrlEnterKey" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 blink::WebInputEvent::Type type, 617 blink::WebInputEvent::Type type,
618 ui::KeyboardCode key_code, 618 ui::KeyboardCode key_code,
619 int native_key_code, 619 int native_key_code,
620 int modifiers) { 620 int modifiers) {
621 NativeWebKeyboardEvent event; 621 NativeWebKeyboardEvent event;
622 BuildSimpleWebKeyEvent(type, key_code, native_key_code, modifiers, &event); 622 BuildSimpleWebKeyEvent(type, key_code, native_key_code, modifiers, &event);
623 web_contents->GetRenderViewHost()->ForwardKeyboardEvent(event); 623 web_contents->GetRenderViewHost()->ForwardKeyboardEvent(event);
624 } 624 }
625 625
626 // Tests that Ctrl+Enter/Cmd+Enter keys on a link open the backgournd tab. 626 // Tests that Ctrl+Enter/Cmd+Enter keys on a link open the backgournd tab.
627 // Failing due to Blink r189541 http://crbug.com/455691 627 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, CtrlEnterKey) {
628 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, DISABLED_CtrlEnterKey) {
629 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 628 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
630 629
631 GURL url(embedded_test_server()->GetURL( 630 GURL url(embedded_test_server()->GetURL(
632 "/popup_blocker/popup-simulated-click-on-anchor.html")); 631 "/popup_blocker/popup-simulated-click-on-anchor.html"));
633 ui_test_utils::NavigateToURL(browser(), url); 632 ui_test_utils::NavigateToURL(browser(), url);
634 633
635 content::WindowedNotificationObserver wait_for_new_tab( 634 content::WindowedNotificationObserver wait_for_new_tab(
636 chrome::NOTIFICATION_TAB_ADDED, 635 chrome::NOTIFICATION_TAB_ADDED,
637 content::NotificationService::AllSources()); 636 content::NotificationService::AllSources());
638 637
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 wait_for_new_tab.Wait(); 669 wait_for_new_tab.Wait();
671 670
672 ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(), 671 ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
673 browser()->host_desktop_type())); 672 browser()->host_desktop_type()));
674 ASSERT_EQ(2, browser()->tab_strip_model()->count()); 673 ASSERT_EQ(2, browser()->tab_strip_model()->count());
675 // Check that we create the background tab. 674 // Check that we create the background tab.
676 ASSERT_EQ(0, browser()->tab_strip_model()->active_index()); 675 ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
677 } 676 }
678 677
679 } // namespace 678 } // namespace
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698