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

Unified Diff: chrome/browser/blocked_popup_container_interactive_uitest.cc

Issue 273032: Do not send some keyboard shortcuts to the renderers (Closed)
Patch Set: cleanup Created 11 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/blocked_popup_container_interactive_uitest.cc
diff --git a/chrome/browser/blocked_popup_container_interactive_uitest.cc b/chrome/browser/blocked_popup_container_interactive_uitest.cc
index 9eb001ac2eee4fcedd1c98c2bfb661a17fd31fde..86d6c131e82862ca4b79e6a32609952f6f62e9f9 100644
--- a/chrome/browser/blocked_popup_container_interactive_uitest.cc
+++ b/chrome/browser/blocked_popup_container_interactive_uitest.cc
@@ -251,7 +251,6 @@ TEST_F(BlockedPopupContainerInteractiveTest, DontBreakOnBlur) {
ASSERT_FALSE(automation()->WaitForWindowCountToBecome(1, 1500));
}
-#if !defined(OS_MACOSX) // see BrowserWindowCocoa::GetCommandId
// Tests that tab related keyboard accelerators are reserved by the app.
class BrowserInteractiveTest : public UITest {
@@ -280,9 +279,10 @@ TEST_F(BrowserInteractiveTest, ReserveKeyboardAccelerators) {
base::VKEY_TAB, views::Event::EF_CONTROL_DOWN));
ASSERT_TRUE(browser->WaitForTabToBecomeActive(0, action_max_timeout_ms()));
+#if !defined(OS_MACOSX) // see BrowserWindowCocoa::GetCommandId
ASSERT_TRUE(browser->ActivateTab(1));
ASSERT_TRUE(window->SimulateOSKeyPress(
base::VKEY_W, views::Event::EF_CONTROL_DOWN));
ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms()));
-}
#endif
+}
« no previous file with comments | « no previous file | chrome/browser/cocoa/browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698