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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/chromeos/events/event_rewriter_unittest.cc

Issue 239313004: EF_NUMPAD_KEY flag for ui::KeyEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit_tests.EventRewriterTest.TestRewriteNumPadKeys* Created 6 years, 8 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 | ui/events/event_constants.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/chromeos/events/event_rewriter.h" 5 #include "chrome/browser/chromeos/events/event_rewriter.h"
6 6
7 #include <X11/keysym.h> 7 #include <X11/keysym.h>
8 #include <X11/XF86keysym.h> 8 #include <X11/XF86keysym.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #undef Bool 10 #undef Bool
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 Mod1Mask)); 555 Mod1Mask));
556 } 556 }
557 557
558 void EventRewriterTest::TestRewriteNumPadKeys() { 558 void EventRewriterTest::TestRewriteNumPadKeys() {
559 TestingPrefServiceSyncable prefs; 559 TestingPrefServiceSyncable prefs;
560 EventRewriter rewriter; 560 EventRewriter rewriter;
561 rewriter.set_pref_service_for_testing(&prefs); 561 rewriter.set_pref_service_for_testing(&prefs);
562 562
563 // XK_KP_Insert (= NumPad 0 without Num Lock), no modifier. 563 // XK_KP_Insert (= NumPad 0 without Num Lock), no modifier.
564 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD0, 564 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD0,
565 0, 565 ui::EF_NUMPAD_KEY,
566 ui::ET_KEY_PRESSED, 566 ui::ET_KEY_PRESSED,
567 keycode_num_pad_0_, 567 keycode_num_pad_0_,
568 Mod2Mask, // Num Lock 568 Mod2Mask, // Num Lock
569 KeyPress), 569 KeyPress),
570 GetRewrittenEventAsString(&rewriter, 570 GetRewrittenEventAsString(&rewriter,
571 ui::VKEY_INSERT, 571 ui::VKEY_INSERT,
572 0, 572 0,
573 ui::ET_KEY_PRESSED, 573 ui::ET_KEY_PRESSED,
574 keycode_num_pad_insert_, 574 keycode_num_pad_insert_,
575 0)); 575 0));
576 576
577 // XK_KP_Insert (= NumPad 0 without Num Lock), Alt modifier. 577 // XK_KP_Insert (= NumPad 0 without Num Lock), Alt modifier.
578 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD0, 578 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD0,
579 ui::EF_ALT_DOWN, 579 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
580 ui::ET_KEY_PRESSED, 580 ui::ET_KEY_PRESSED,
581 keycode_num_pad_0_, 581 keycode_num_pad_0_,
582 Mod1Mask | Mod2Mask, 582 Mod1Mask | Mod2Mask,
583 KeyPress), 583 KeyPress),
584 GetRewrittenEventAsString(&rewriter, 584 GetRewrittenEventAsString(&rewriter,
585 ui::VKEY_INSERT, 585 ui::VKEY_INSERT,
586 ui::EF_ALT_DOWN, 586 ui::EF_ALT_DOWN,
587 ui::ET_KEY_PRESSED, 587 ui::ET_KEY_PRESSED,
588 keycode_num_pad_insert_, 588 keycode_num_pad_insert_,
589 Mod1Mask)); 589 Mod1Mask));
590 590
591 // XK_KP_Delete (= NumPad . without Num Lock), Alt modifier. 591 // XK_KP_Delete (= NumPad . without Num Lock), Alt modifier.
592 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_DECIMAL, 592 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_DECIMAL,
593 ui::EF_ALT_DOWN, 593 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
594 ui::ET_KEY_PRESSED, 594 ui::ET_KEY_PRESSED,
595 keycode_num_pad_decimal_, 595 keycode_num_pad_decimal_,
596 Mod1Mask | Mod2Mask, 596 Mod1Mask | Mod2Mask,
597 KeyPress), 597 KeyPress),
598 GetRewrittenEventAsString(&rewriter, 598 GetRewrittenEventAsString(&rewriter,
599 ui::VKEY_DELETE, 599 ui::VKEY_DELETE,
600 ui::EF_ALT_DOWN, 600 ui::EF_ALT_DOWN,
601 ui::ET_KEY_PRESSED, 601 ui::ET_KEY_PRESSED,
602 keycode_num_pad_delete_, 602 keycode_num_pad_delete_,
603 Mod1Mask)); 603 Mod1Mask));
604 604
605 // XK_KP_End (= NumPad 1 without Num Lock), Alt modifier. 605 // XK_KP_End (= NumPad 1 without Num Lock), Alt modifier.
606 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD1, 606 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD1,
607 ui::EF_ALT_DOWN, 607 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
608 ui::ET_KEY_PRESSED, 608 ui::ET_KEY_PRESSED,
609 keycode_num_pad_1_, 609 keycode_num_pad_1_,
610 Mod1Mask | Mod2Mask, 610 Mod1Mask | Mod2Mask,
611 KeyPress), 611 KeyPress),
612 GetRewrittenEventAsString(&rewriter, 612 GetRewrittenEventAsString(&rewriter,
613 ui::VKEY_END, 613 ui::VKEY_END,
614 ui::EF_ALT_DOWN, 614 ui::EF_ALT_DOWN,
615 ui::ET_KEY_PRESSED, 615 ui::ET_KEY_PRESSED,
616 keycode_num_pad_end_, 616 keycode_num_pad_end_,
617 Mod1Mask)); 617 Mod1Mask));
618 618
619 // XK_KP_Down (= NumPad 2 without Num Lock), Alt modifier. 619 // XK_KP_Down (= NumPad 2 without Num Lock), Alt modifier.
620 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD2, 620 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD2,
621 ui::EF_ALT_DOWN, 621 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
622 ui::ET_KEY_PRESSED, 622 ui::ET_KEY_PRESSED,
623 keycode_num_pad_2_, 623 keycode_num_pad_2_,
624 Mod1Mask | Mod2Mask, 624 Mod1Mask | Mod2Mask,
625 KeyPress), 625 KeyPress),
626 GetRewrittenEventAsString(&rewriter, 626 GetRewrittenEventAsString(&rewriter,
627 ui::VKEY_DOWN, 627 ui::VKEY_DOWN,
628 ui::EF_ALT_DOWN, 628 ui::EF_ALT_DOWN,
629 ui::ET_KEY_PRESSED, 629 ui::ET_KEY_PRESSED,
630 keycode_num_pad_down_, 630 keycode_num_pad_down_,
631 Mod1Mask)); 631 Mod1Mask));
632 632
633 // XK_KP_Next (= NumPad 3 without Num Lock), Alt modifier. 633 // XK_KP_Next (= NumPad 3 without Num Lock), Alt modifier.
634 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD3, 634 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD3,
635 ui::EF_ALT_DOWN, 635 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
636 ui::ET_KEY_PRESSED, 636 ui::ET_KEY_PRESSED,
637 keycode_num_pad_3_, 637 keycode_num_pad_3_,
638 Mod1Mask | Mod2Mask, 638 Mod1Mask | Mod2Mask,
639 KeyPress), 639 KeyPress),
640 GetRewrittenEventAsString(&rewriter, 640 GetRewrittenEventAsString(&rewriter,
641 ui::VKEY_NEXT, 641 ui::VKEY_NEXT,
642 ui::EF_ALT_DOWN, 642 ui::EF_ALT_DOWN,
643 ui::ET_KEY_PRESSED, 643 ui::ET_KEY_PRESSED,
644 keycode_num_pad_next_, 644 keycode_num_pad_next_,
645 Mod1Mask)); 645 Mod1Mask));
646 646
647 // XK_KP_Left (= NumPad 4 without Num Lock), Alt modifier. 647 // XK_KP_Left (= NumPad 4 without Num Lock), Alt modifier.
648 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD4, 648 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD4,
649 ui::EF_ALT_DOWN, 649 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
650 ui::ET_KEY_PRESSED, 650 ui::ET_KEY_PRESSED,
651 keycode_num_pad_4_, 651 keycode_num_pad_4_,
652 Mod1Mask | Mod2Mask, 652 Mod1Mask | Mod2Mask,
653 KeyPress), 653 KeyPress),
654 GetRewrittenEventAsString(&rewriter, 654 GetRewrittenEventAsString(&rewriter,
655 ui::VKEY_LEFT, 655 ui::VKEY_LEFT,
656 ui::EF_ALT_DOWN, 656 ui::EF_ALT_DOWN,
657 ui::ET_KEY_PRESSED, 657 ui::ET_KEY_PRESSED,
658 keycode_num_pad_left_, 658 keycode_num_pad_left_,
659 Mod1Mask)); 659 Mod1Mask));
660 660
661 // XK_KP_Begin (= NumPad 5 without Num Lock), Alt modifier. 661 // XK_KP_Begin (= NumPad 5 without Num Lock), Alt modifier.
662 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD5, 662 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD5,
663 ui::EF_ALT_DOWN, 663 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
664 ui::ET_KEY_PRESSED, 664 ui::ET_KEY_PRESSED,
665 keycode_num_pad_5_, 665 keycode_num_pad_5_,
666 Mod1Mask | Mod2Mask, 666 Mod1Mask | Mod2Mask,
667 KeyPress), 667 KeyPress),
668 GetRewrittenEventAsString(&rewriter, 668 GetRewrittenEventAsString(&rewriter,
669 ui::VKEY_CLEAR, 669 ui::VKEY_CLEAR,
670 ui::EF_ALT_DOWN, 670 ui::EF_ALT_DOWN,
671 ui::ET_KEY_PRESSED, 671 ui::ET_KEY_PRESSED,
672 keycode_num_pad_begin_, 672 keycode_num_pad_begin_,
673 Mod1Mask)); 673 Mod1Mask));
674 674
675 // XK_KP_Right (= NumPad 6 without Num Lock), Alt modifier. 675 // XK_KP_Right (= NumPad 6 without Num Lock), Alt modifier.
676 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD6, 676 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD6,
677 ui::EF_ALT_DOWN, 677 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
678 ui::ET_KEY_PRESSED, 678 ui::ET_KEY_PRESSED,
679 keycode_num_pad_6_, 679 keycode_num_pad_6_,
680 Mod1Mask | Mod2Mask, 680 Mod1Mask | Mod2Mask,
681 KeyPress), 681 KeyPress),
682 GetRewrittenEventAsString(&rewriter, 682 GetRewrittenEventAsString(&rewriter,
683 ui::VKEY_RIGHT, 683 ui::VKEY_RIGHT,
684 ui::EF_ALT_DOWN, 684 ui::EF_ALT_DOWN,
685 ui::ET_KEY_PRESSED, 685 ui::ET_KEY_PRESSED,
686 keycode_num_pad_right_, 686 keycode_num_pad_right_,
687 Mod1Mask)); 687 Mod1Mask));
688 688
689 // XK_KP_Home (= NumPad 7 without Num Lock), Alt modifier. 689 // XK_KP_Home (= NumPad 7 without Num Lock), Alt modifier.
690 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD7, 690 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD7,
691 ui::EF_ALT_DOWN, 691 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
692 ui::ET_KEY_PRESSED, 692 ui::ET_KEY_PRESSED,
693 keycode_num_pad_7_, 693 keycode_num_pad_7_,
694 Mod1Mask | Mod2Mask, 694 Mod1Mask | Mod2Mask,
695 KeyPress), 695 KeyPress),
696 GetRewrittenEventAsString(&rewriter, 696 GetRewrittenEventAsString(&rewriter,
697 ui::VKEY_HOME, 697 ui::VKEY_HOME,
698 ui::EF_ALT_DOWN, 698 ui::EF_ALT_DOWN,
699 ui::ET_KEY_PRESSED, 699 ui::ET_KEY_PRESSED,
700 keycode_num_pad_home_, 700 keycode_num_pad_home_,
701 Mod1Mask)); 701 Mod1Mask));
702 702
703 // XK_KP_Up (= NumPad 8 without Num Lock), Alt modifier. 703 // XK_KP_Up (= NumPad 8 without Num Lock), Alt modifier.
704 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD8, 704 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD8,
705 ui::EF_ALT_DOWN, 705 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
706 ui::ET_KEY_PRESSED, 706 ui::ET_KEY_PRESSED,
707 keycode_num_pad_8_, 707 keycode_num_pad_8_,
708 Mod1Mask | Mod2Mask, 708 Mod1Mask | Mod2Mask,
709 KeyPress), 709 KeyPress),
710 GetRewrittenEventAsString(&rewriter, 710 GetRewrittenEventAsString(&rewriter,
711 ui::VKEY_UP, 711 ui::VKEY_UP,
712 ui::EF_ALT_DOWN, 712 ui::EF_ALT_DOWN,
713 ui::ET_KEY_PRESSED, 713 ui::ET_KEY_PRESSED,
714 keycode_num_pad_up_, 714 keycode_num_pad_up_,
715 Mod1Mask)); 715 Mod1Mask));
716 716
717 // XK_KP_Prior (= NumPad 9 without Num Lock), Alt modifier. 717 // XK_KP_Prior (= NumPad 9 without Num Lock), Alt modifier.
718 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD9, 718 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD9,
719 ui::EF_ALT_DOWN, 719 ui::EF_ALT_DOWN | ui::EF_NUMPAD_KEY,
720 ui::ET_KEY_PRESSED, 720 ui::ET_KEY_PRESSED,
721 keycode_num_pad_9_, 721 keycode_num_pad_9_,
722 Mod1Mask | Mod2Mask, 722 Mod1Mask | Mod2Mask,
723 KeyPress), 723 KeyPress),
724 GetRewrittenEventAsString(&rewriter, 724 GetRewrittenEventAsString(&rewriter,
725 ui::VKEY_PRIOR, 725 ui::VKEY_PRIOR,
726 ui::EF_ALT_DOWN, 726 ui::EF_ALT_DOWN,
727 ui::ET_KEY_PRESSED, 727 ui::ET_KEY_PRESSED,
728 keycode_num_pad_prior_, 728 keycode_num_pad_prior_,
729 Mod1Mask)); 729 Mod1Mask));
730 730
731 // XK_KP_0 (= NumPad 0 with Num Lock), Num Lock modifier. 731 // XK_KP_0 (= NumPad 0 with Num Lock), Num Lock modifier.
732 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD0, 732 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD0,
733 0, 733 ui::EF_NUMPAD_KEY,
734 ui::ET_KEY_PRESSED, 734 ui::ET_KEY_PRESSED,
735 keycode_num_pad_0_, 735 keycode_num_pad_0_,
736 Mod2Mask, 736 Mod2Mask,
737 KeyPress), 737 KeyPress),
738 GetRewrittenEventAsString(&rewriter, 738 GetRewrittenEventAsString(&rewriter,
739 ui::VKEY_NUMPAD0, 739 ui::VKEY_NUMPAD0,
740 0, 740 0,
741 ui::ET_KEY_PRESSED, 741 ui::ET_KEY_PRESSED,
742 keycode_num_pad_0_, 742 keycode_num_pad_0_,
743 Mod2Mask)); 743 Mod2Mask));
744 744
745 // XK_KP_DECIMAL (= NumPad . with Num Lock), Num Lock modifier. 745 // XK_KP_DECIMAL (= NumPad . with Num Lock), Num Lock modifier.
746 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_DECIMAL, 746 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_DECIMAL,
747 0, 747 ui::EF_NUMPAD_KEY,
748 ui::ET_KEY_PRESSED, 748 ui::ET_KEY_PRESSED,
749 keycode_num_pad_decimal_, 749 keycode_num_pad_decimal_,
750 Mod2Mask, 750 Mod2Mask,
751 KeyPress), 751 KeyPress),
752 GetRewrittenEventAsString(&rewriter, 752 GetRewrittenEventAsString(&rewriter,
753 ui::VKEY_DECIMAL, 753 ui::VKEY_DECIMAL,
754 0, 754 0,
755 ui::ET_KEY_PRESSED, 755 ui::ET_KEY_PRESSED,
756 keycode_num_pad_decimal_, 756 keycode_num_pad_decimal_,
757 Mod2Mask)); 757 Mod2Mask));
758 758
759 // XK_KP_1 (= NumPad 1 with Num Lock), Num Lock modifier. 759 // XK_KP_1 (= NumPad 1 with Num Lock), Num Lock modifier.
760 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD1, 760 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD1,
761 0, 761 ui::EF_NUMPAD_KEY,
762 ui::ET_KEY_PRESSED, 762 ui::ET_KEY_PRESSED,
763 keycode_num_pad_1_, 763 keycode_num_pad_1_,
764 Mod2Mask, 764 Mod2Mask,
765 KeyPress), 765 KeyPress),
766 GetRewrittenEventAsString(&rewriter, 766 GetRewrittenEventAsString(&rewriter,
767 ui::VKEY_NUMPAD1, 767 ui::VKEY_NUMPAD1,
768 0, 768 0,
769 ui::ET_KEY_PRESSED, 769 ui::ET_KEY_PRESSED,
770 keycode_num_pad_1_, 770 keycode_num_pad_1_,
771 Mod2Mask)); 771 Mod2Mask));
772 772
773 // XK_KP_2 (= NumPad 2 with Num Lock), Num Lock modifier. 773 // XK_KP_2 (= NumPad 2 with Num Lock), Num Lock modifier.
774 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD2, 774 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD2,
775 0, 775 ui::EF_NUMPAD_KEY,
776 ui::ET_KEY_PRESSED, 776 ui::ET_KEY_PRESSED,
777 keycode_num_pad_2_, 777 keycode_num_pad_2_,
778 Mod2Mask, 778 Mod2Mask,
779 KeyPress), 779 KeyPress),
780 GetRewrittenEventAsString(&rewriter, 780 GetRewrittenEventAsString(&rewriter,
781 ui::VKEY_NUMPAD2, 781 ui::VKEY_NUMPAD2,
782 0, 782 0,
783 ui::ET_KEY_PRESSED, 783 ui::ET_KEY_PRESSED,
784 keycode_num_pad_2_, 784 keycode_num_pad_2_,
785 Mod2Mask)); 785 Mod2Mask));
786 786
787 // XK_KP_3 (= NumPad 3 with Num Lock), Num Lock modifier. 787 // XK_KP_3 (= NumPad 3 with Num Lock), Num Lock modifier.
788 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD3, 788 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD3,
789 0, 789 ui::EF_NUMPAD_KEY,
790 ui::ET_KEY_PRESSED, 790 ui::ET_KEY_PRESSED,
791 keycode_num_pad_3_, 791 keycode_num_pad_3_,
792 Mod2Mask, 792 Mod2Mask,
793 KeyPress), 793 KeyPress),
794 GetRewrittenEventAsString(&rewriter, 794 GetRewrittenEventAsString(&rewriter,
795 ui::VKEY_NUMPAD3, 795 ui::VKEY_NUMPAD3,
796 0, 796 0,
797 ui::ET_KEY_PRESSED, 797 ui::ET_KEY_PRESSED,
798 keycode_num_pad_3_, 798 keycode_num_pad_3_,
799 Mod2Mask)); 799 Mod2Mask));
800 800
801 // XK_KP_4 (= NumPad 4 with Num Lock), Num Lock modifier. 801 // XK_KP_4 (= NumPad 4 with Num Lock), Num Lock modifier.
802 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD4, 802 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD4,
803 0, 803 ui::EF_NUMPAD_KEY,
804 ui::ET_KEY_PRESSED, 804 ui::ET_KEY_PRESSED,
805 keycode_num_pad_4_, 805 keycode_num_pad_4_,
806 Mod2Mask, 806 Mod2Mask,
807 KeyPress), 807 KeyPress),
808 GetRewrittenEventAsString(&rewriter, 808 GetRewrittenEventAsString(&rewriter,
809 ui::VKEY_NUMPAD4, 809 ui::VKEY_NUMPAD4,
810 0, 810 0,
811 ui::ET_KEY_PRESSED, 811 ui::ET_KEY_PRESSED,
812 keycode_num_pad_4_, 812 keycode_num_pad_4_,
813 Mod2Mask)); 813 Mod2Mask));
814 814
815 // XK_KP_5 (= NumPad 5 with Num Lock), Num Lock modifier. 815 // XK_KP_5 (= NumPad 5 with Num Lock), Num Lock modifier.
816 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD5, 816 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD5,
817 0, 817 ui::EF_NUMPAD_KEY,
818 ui::ET_KEY_PRESSED, 818 ui::ET_KEY_PRESSED,
819 keycode_num_pad_5_, 819 keycode_num_pad_5_,
820 Mod2Mask, 820 Mod2Mask,
821 KeyPress), 821 KeyPress),
822 GetRewrittenEventAsString(&rewriter, 822 GetRewrittenEventAsString(&rewriter,
823 ui::VKEY_NUMPAD5, 823 ui::VKEY_NUMPAD5,
824 0, 824 0,
825 ui::ET_KEY_PRESSED, 825 ui::ET_KEY_PRESSED,
826 keycode_num_pad_5_, 826 keycode_num_pad_5_,
827 Mod2Mask)); 827 Mod2Mask));
828 828
829 // XK_KP_6 (= NumPad 6 with Num Lock), Num Lock modifier. 829 // XK_KP_6 (= NumPad 6 with Num Lock), Num Lock modifier.
830 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD6, 830 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD6,
831 0, 831 ui::EF_NUMPAD_KEY,
832 ui::ET_KEY_PRESSED, 832 ui::ET_KEY_PRESSED,
833 keycode_num_pad_6_, 833 keycode_num_pad_6_,
834 Mod2Mask, 834 Mod2Mask,
835 KeyPress), 835 KeyPress),
836 GetRewrittenEventAsString(&rewriter, 836 GetRewrittenEventAsString(&rewriter,
837 ui::VKEY_NUMPAD6, 837 ui::VKEY_NUMPAD6,
838 0, 838 0,
839 ui::ET_KEY_PRESSED, 839 ui::ET_KEY_PRESSED,
840 keycode_num_pad_6_, 840 keycode_num_pad_6_,
841 Mod2Mask)); 841 Mod2Mask));
842 842
843 // XK_KP_7 (= NumPad 7 with Num Lock), Num Lock modifier. 843 // XK_KP_7 (= NumPad 7 with Num Lock), Num Lock modifier.
844 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD7, 844 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD7,
845 0, 845 ui::EF_NUMPAD_KEY,
846 ui::ET_KEY_PRESSED, 846 ui::ET_KEY_PRESSED,
847 keycode_num_pad_7_, 847 keycode_num_pad_7_,
848 Mod2Mask, 848 Mod2Mask,
849 KeyPress), 849 KeyPress),
850 GetRewrittenEventAsString(&rewriter, 850 GetRewrittenEventAsString(&rewriter,
851 ui::VKEY_NUMPAD7, 851 ui::VKEY_NUMPAD7,
852 0, 852 0,
853 ui::ET_KEY_PRESSED, 853 ui::ET_KEY_PRESSED,
854 keycode_num_pad_7_, 854 keycode_num_pad_7_,
855 Mod2Mask)); 855 Mod2Mask));
856 856
857 // XK_KP_8 (= NumPad 8 with Num Lock), Num Lock modifier. 857 // XK_KP_8 (= NumPad 8 with Num Lock), Num Lock modifier.
858 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD8, 858 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD8,
859 0, 859 ui::EF_NUMPAD_KEY,
860 ui::ET_KEY_PRESSED, 860 ui::ET_KEY_PRESSED,
861 keycode_num_pad_8_, 861 keycode_num_pad_8_,
862 Mod2Mask, 862 Mod2Mask,
863 KeyPress), 863 KeyPress),
864 GetRewrittenEventAsString(&rewriter, 864 GetRewrittenEventAsString(&rewriter,
865 ui::VKEY_NUMPAD8, 865 ui::VKEY_NUMPAD8,
866 0, 866 0,
867 ui::ET_KEY_PRESSED, 867 ui::ET_KEY_PRESSED,
868 keycode_num_pad_8_, 868 keycode_num_pad_8_,
869 Mod2Mask)); 869 Mod2Mask));
870 870
871 // XK_KP_9 (= NumPad 9 with Num Lock), Num Lock modifier. 871 // XK_KP_9 (= NumPad 9 with Num Lock), Num Lock modifier.
872 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD9, 872 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD9,
873 0, 873 ui::EF_NUMPAD_KEY,
874 ui::ET_KEY_PRESSED, 874 ui::ET_KEY_PRESSED,
875 keycode_num_pad_9_, 875 keycode_num_pad_9_,
876 Mod2Mask, 876 Mod2Mask,
877 KeyPress), 877 KeyPress),
878 GetRewrittenEventAsString(&rewriter, 878 GetRewrittenEventAsString(&rewriter,
879 ui::VKEY_NUMPAD9, 879 ui::VKEY_NUMPAD9,
880 0, 880 0,
881 ui::ET_KEY_PRESSED, 881 ui::ET_KEY_PRESSED,
882 keycode_num_pad_9_, 882 keycode_num_pad_9_,
883 Mod2Mask)); 883 Mod2Mask));
(...skipping 17 matching lines...) Expand all
901 void EventRewriterTest::TestRewriteNumPadKeysOnAppleKeyboard() { 901 void EventRewriterTest::TestRewriteNumPadKeysOnAppleKeyboard() {
902 TestingPrefServiceSyncable prefs; 902 TestingPrefServiceSyncable prefs;
903 EventRewriter rewriter; 903 EventRewriter rewriter;
904 rewriter.DeviceAddedForTesting(0, "Apple Keyboard"); 904 rewriter.DeviceAddedForTesting(0, "Apple Keyboard");
905 rewriter.set_last_device_id_for_testing(0); 905 rewriter.set_last_device_id_for_testing(0);
906 rewriter.set_pref_service_for_testing(&prefs); 906 rewriter.set_pref_service_for_testing(&prefs);
907 907
908 // XK_KP_End (= NumPad 1 without Num Lock), Win modifier. 908 // XK_KP_End (= NumPad 1 without Num Lock), Win modifier.
909 // The result should be "Num Pad 1 with Control + Num Lock modifiers". 909 // The result should be "Num Pad 1 with Control + Num Lock modifiers".
910 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD1, 910 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD1,
911 ui::EF_CONTROL_DOWN, 911 ui::EF_CONTROL_DOWN | ui::EF_NUMPAD_KEY,
912 ui::ET_KEY_PRESSED, 912 ui::ET_KEY_PRESSED,
913 keycode_num_pad_1_, 913 keycode_num_pad_1_,
914 ControlMask | Mod2Mask, 914 ControlMask | Mod2Mask,
915 KeyPress), 915 KeyPress),
916 GetRewrittenEventAsString(&rewriter, 916 GetRewrittenEventAsString(&rewriter,
917 ui::VKEY_END, 917 ui::VKEY_END,
918 0, 918 0,
919 ui::ET_KEY_PRESSED, 919 ui::ET_KEY_PRESSED,
920 keycode_num_pad_end_, 920 keycode_num_pad_end_,
921 Mod4Mask)); 921 Mod4Mask));
922 922
923 // XK_KP_1 (= NumPad 1 without Num Lock), Win modifier. 923 // XK_KP_1 (= NumPad 1 without Num Lock), Win modifier.
924 // The result should also be "Num Pad 1 with Control + Num Lock modifiers". 924 // The result should also be "Num Pad 1 with Control + Num Lock modifiers".
925 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD1, 925 EXPECT_EQ(GetExpectedResultAsString(ui::VKEY_NUMPAD1,
926 ui::EF_CONTROL_DOWN, 926 ui::EF_CONTROL_DOWN | ui::EF_NUMPAD_KEY,
927 ui::ET_KEY_PRESSED, 927 ui::ET_KEY_PRESSED,
928 keycode_num_pad_1_, 928 keycode_num_pad_1_,
929 ControlMask | Mod2Mask, 929 ControlMask | Mod2Mask,
930 KeyPress), 930 KeyPress),
931 GetRewrittenEventAsString(&rewriter, 931 GetRewrittenEventAsString(&rewriter,
932 ui::VKEY_NUMPAD1, 932 ui::VKEY_NUMPAD1,
933 0, 933 0,
934 ui::ET_KEY_PRESSED, 934 ui::ET_KEY_PRESSED,
935 keycode_num_pad_end_, 935 keycode_num_pad_end_,
936 Mod4Mask)); 936 Mod4Mask));
(...skipping 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after
2472 ui::ScopedXI2Event xev; 2472 ui::ScopedXI2Event xev;
2473 xev.InitGenericButtonEvent( 2473 xev.InitGenericButtonEvent(
2474 11, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag); 2474 11, ui::ET_MOUSE_RELEASED, gfx::Point(), kLeftAndAltFlag);
2475 ui::MouseEvent release(xev); 2475 ui::MouseEvent release(xev);
2476 RewriteMouseEvent(&rewriter, &release); 2476 RewriteMouseEvent(&rewriter, &release);
2477 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & release.flags()); 2477 EXPECT_TRUE(ui::EF_RIGHT_MOUSE_BUTTON & release.flags());
2478 } 2478 }
2479 } 2479 }
2480 2480
2481 } // namespace chromeos 2481 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | ui/events/event_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698