| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( | 502 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
| 503 browser(), ui::VKEY_ESCAPE, false, false, false, false)); | 503 browser(), ui::VKEY_ESCAPE, false, false, false, false)); |
| 504 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 504 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
| 505 | 505 |
| 506 // Press Cmd+F with keydown suppressed shall not open the find box. | 506 // Press Cmd+F with keydown suppressed shall not open the find box. |
| 507 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCmdFSuppressKeyDown)); | 507 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCmdFSuppressKeyDown)); |
| 508 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 508 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
| 509 } | 509 } |
| 510 #endif | 510 #endif |
| 511 | 511 |
| 512 // http://crbug.com/81451 | 512 #if defined(OS_MACOSX) || defined(USE_AURA) |
| 513 #if defined(OS_MACOSX) | 513 // http://crbug.com/81451 for mac |
| 514 // http://crbug.com/107026 for aura |
| 514 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) { | 515 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) { |
| 515 #else | 516 #else |
| 516 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) { | 517 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) { |
| 517 #endif | 518 #endif |
| 518 #if defined(OS_MACOSX) | 519 #if defined(OS_MACOSX) |
| 519 // On Mac, access keys use ctrl+alt modifiers. | 520 // On Mac, access keys use ctrl+alt modifiers. |
| 520 static const KeyEventTestData kTestAccessA = { | 521 static const KeyEventTestData kTestAccessA = { |
| 521 ui::VKEY_A, true, false, true, false, | 522 ui::VKEY_A, true, false, true, false, |
| 522 false, false, false, false, 6, | 523 false, false, false, false, 6, |
| 523 { "D 17 0 true false false false", | 524 { "D 17 0 true false false false", |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 855 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress)); | 856 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress)); |
| 856 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 857 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
| 857 | 858 |
| 858 // Ctrl+Alt should have no effect. | 859 // Ctrl+Alt should have no effect. |
| 859 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey)); | 860 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey)); |
| 860 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 861 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
| 861 } | 862 } |
| 862 #endif | 863 #endif |
| 863 | 864 |
| 864 } // namespace | 865 } // namespace |
| OLD | NEW |