OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/keyboard_codes.h" | 8 #include "base/keyboard_codes.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 ui_test_utils::ShowAndFocusNativeWindow(window); | 142 ui_test_utils::ShowAndFocusNativeWindow(window); |
143 } | 143 } |
144 | 144 |
145 void SendKey(base::KeyboardCode key, | 145 void SendKey(base::KeyboardCode key, |
146 bool control, | 146 bool control, |
147 bool shift, | 147 bool shift, |
148 bool alt, | 148 bool alt, |
149 bool command) { | 149 bool command) { |
150 gfx::NativeWindow window = NULL; | 150 gfx::NativeWindow window = NULL; |
151 ASSERT_NO_FATAL_FAILURE(GetNativeWindow(&window)); | 151 ASSERT_NO_FATAL_FAILURE(GetNativeWindow(&window)); |
152 EXPECT_TRUE(ui_controls::SendKeyPressNotifyWhenDone( | 152 ASSERT_TRUE(ui_test_utils::SendKeyPressSync( |
153 window, key, control, shift, alt, command, | 153 window, key, control, shift, alt, command)); |
154 new MessageLoop::QuitTask())); | |
155 ui_test_utils::RunMessageLoop(); | |
156 } | 154 } |
157 | 155 |
158 bool IsViewFocused(ViewID vid) { | 156 bool IsViewFocused(ViewID vid) { |
159 return ui_test_utils::IsViewFocused(browser(), vid); | 157 return ui_test_utils::IsViewFocused(browser(), vid); |
160 } | 158 } |
161 | 159 |
162 void ClickOnView(ViewID vid) { | 160 void ClickOnView(ViewID vid) { |
163 ui_test_utils::ClickOnView(browser(), vid); | 161 ui_test_utils::ClickOnView(browser(), vid); |
164 } | 162 } |
165 | 163 |
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
783 ASSERT_EQ(1, browser()->selected_index()); | 781 ASSERT_EQ(1, browser()->selected_index()); |
784 | 782 |
785 // Ctrl+W should be blockable. | 783 // Ctrl+W should be blockable. |
786 browser()->SelectNumberedTab(0); | 784 browser()->SelectNumberedTab(0); |
787 ASSERT_EQ(0, browser()->selected_index()); | 785 ASSERT_EQ(0, browser()->selected_index()); |
788 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlWBlocked)); | 786 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlWBlocked)); |
789 ASSERT_EQ(2, browser()->tab_count()); | 787 ASSERT_EQ(2, browser()->tab_count()); |
790 | 788 |
791 // Ctrl+F4 to close the tab. | 789 // Ctrl+F4 to close the tab. |
792 ASSERT_NO_FATAL_FAILURE(SuppressAllEvents(0, true)); | 790 ASSERT_NO_FATAL_FAILURE(SuppressAllEvents(0, true)); |
793 ASSERT_NO_FATAL_FAILURE( SendKey(base::VKEY_F4, true, false, false, false)); | 791 ASSERT_NO_FATAL_FAILURE(SendKey(base::VKEY_F4, true, false, false, false)); |
794 ASSERT_EQ(1, browser()->tab_count()); | 792 ASSERT_EQ(1, browser()->tab_count()); |
795 #endif | 793 #endif |
796 } | 794 } |
797 | 795 |
798 #if defined(OS_MACOSX) | 796 #if defined(OS_MACOSX) |
799 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, EditorKeyBindings) { | 797 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, EditorKeyBindings) { |
800 static const KeyEventTestData kTestCtrlA = { | 798 static const KeyEventTestData kTestCtrlA = { |
801 base::VKEY_A, true, false, false, false, | 799 base::VKEY_A, true, false, false, false, |
802 false, false, false, false, 4, | 800 false, false, false, false, 4, |
803 { "D 17 0 true false false false", | 801 { "D 17 0 true false false false", |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
923 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress)); | 921 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress)); |
924 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 922 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
925 | 923 |
926 // Ctrl+Alt should have no effect. | 924 // Ctrl+Alt should have no effect. |
927 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey)); | 925 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey)); |
928 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 926 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
929 } | 927 } |
930 #endif | 928 #endif |
931 | 929 |
932 } // namespace | 930 } // namespace |
OLD | NEW |