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

Side by Side Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 404203003: Distinguish between keystroke and character events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IsCharFromNative() for Mac build Created 6 years, 5 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 | ash/accelerators/accelerator_filter_unittest.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 "ash/accelerators/accelerator_controller.h" 5 #include "ash/accelerators/accelerator_controller.h"
6 6
7 #include "ash/accelerators/accelerator_table.h" 7 #include "ash/accelerators/accelerator_table.h"
8 #include "ash/accessibility_delegate.h" 8 #include "ash/accessibility_delegate.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) { 616 TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) {
617 ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE); 617 ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
618 TestTarget target; 618 TestTarget target;
619 GetController()->Register(accelerator_a, &target); 619 GetController()->Register(accelerator_a, &target);
620 620
621 // The accelerator is processed only once. 621 // The accelerator is processed only once.
622 ui::EventProcessor* dispatcher = 622 ui::EventProcessor* dispatcher =
623 Shell::GetPrimaryRootWindow()->GetHost()->event_processor(); 623 Shell::GetPrimaryRootWindow()->GetHost()->event_processor();
624 #if defined(OS_WIN) 624 #if defined(OS_WIN)
625 MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 }; 625 MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 };
626 ui::KeyEvent key_event1(msg1, false); 626 ui::KeyEvent key_event1(msg1);
627 key_event1.SetTranslated(true); 627 key_event1.SetTranslated(true);
628 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); 628 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1);
629 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); 629 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed);
630 630
631 MSG msg2 = { NULL, WM_CHAR, L'A', 0 }; 631 MSG msg2 = { NULL, WM_CHAR, L'A', 0 };
632 ui::KeyEvent key_event2(msg2, true); 632 ui::KeyEvent key_event2(msg2);
633 key_event2.SetTranslated(true); 633 key_event2.SetTranslated(true);
634 details = dispatcher->OnEventFromSource(&key_event2); 634 details = dispatcher->OnEventFromSource(&key_event2);
635 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); 635 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed);
636 636
637 MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 }; 637 MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 };
638 ui::KeyEvent key_event3(msg3, false); 638 ui::KeyEvent key_event3(msg3);
639 key_event3.SetTranslated(true); 639 key_event3.SetTranslated(true);
640 details = dispatcher->OnEventFromSource(&key_event3); 640 details = dispatcher->OnEventFromSource(&key_event3);
641 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); 641 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed);
642 #elif defined(USE_X11) 642 #elif defined(USE_X11)
643 ui::ScopedXI2Event key_event; 643 ui::ScopedXI2Event key_event;
644 key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0); 644 key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0);
645 ui::KeyEvent key_event1(key_event, false); 645 ui::KeyEvent key_event1(key_event);
646 key_event1.SetTranslated(true); 646 key_event1.SetTranslated(true);
647 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1); 647 ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1);
648 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed); 648 EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed);
649 649
650 ui::KeyEvent key_event2(key_event, true); 650 ui::KeyEvent key_event2('A', ui::VKEY_A, ui::EF_NONE);
651 key_event2.SetTranslated(true); 651 key_event2.SetTranslated(true);
652 details = dispatcher->OnEventFromSource(&key_event2); 652 details = dispatcher->OnEventFromSource(&key_event2);
653 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed); 653 EXPECT_FALSE(key_event2.handled() || details.dispatcher_destroyed);
654 654
655 key_event.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, 0); 655 key_event.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, 0);
656 ui::KeyEvent key_event3(key_event, false); 656 ui::KeyEvent key_event3(key_event);
657 key_event3.SetTranslated(true); 657 key_event3.SetTranslated(true);
658 details = dispatcher->OnEventFromSource(&key_event3); 658 details = dispatcher->OnEventFromSource(&key_event3);
659 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed); 659 EXPECT_FALSE(key_event3.handled() || details.dispatcher_destroyed);
660 #endif 660 #endif
661 EXPECT_EQ(1, target.accelerator_pressed_count()); 661 EXPECT_EQ(1, target.accelerator_pressed_count());
662 } 662 }
663 #endif 663 #endif
664 664
665 TEST_F(AcceleratorControllerTest, GlobalAccelerators) { 665 TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
666 // CycleBackward 666 // CycleBackward
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 window.reset(CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20))); 1244 window.reset(CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
1245 wm::ActivateWindow(window.get()); 1245 wm::ActivateWindow(window.get());
1246 GetController()->PerformAction(WINDOW_MINIMIZE, dummy); 1246 GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
1247 delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE); 1247 delegate->TriggerAccessibilityAlert(A11Y_ALERT_NONE);
1248 GetController()->PerformAction(kActionsNeedingWindow[i], dummy); 1248 GetController()->PerformAction(kActionsNeedingWindow[i], dummy);
1249 EXPECT_NE(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED); 1249 EXPECT_NE(delegate->GetLastAccessibilityAlert(), A11Y_ALERT_WINDOW_NEEDED);
1250 } 1250 }
1251 } 1251 }
1252 1252
1253 } // namespace ash 1253 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698