| OLD | NEW |
| 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 #include "ash/accelerators/accelerator_table.h" | 6 #include "ash/accelerators/accelerator_table.h" |
| 7 #include "ash/caps_lock_delegate.h" | 7 #include "ash/caps_lock_delegate.h" |
| 8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
| 9 #include "ash/ime_control_delegate.h" | 9 #include "ash/ime_control_delegate.h" |
| 10 #include "ash/screenshot_delegate.h" | 10 #include "ash/screenshot_delegate.h" |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 592 TEST_F(AcceleratorControllerTest, GlobalAccelerators) { | 592 TEST_F(AcceleratorControllerTest, GlobalAccelerators) { |
| 593 // CycleBackward | 593 // CycleBackward |
| 594 EXPECT_TRUE(ProcessWithContext( | 594 EXPECT_TRUE(ProcessWithContext( |
| 595 ui::Accelerator(ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN))); | 595 ui::Accelerator(ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN))); |
| 596 // CycleForward | 596 // CycleForward |
| 597 EXPECT_TRUE(ProcessWithContext( | 597 EXPECT_TRUE(ProcessWithContext( |
| 598 ui::Accelerator(ui::VKEY_TAB, ui::EF_ALT_DOWN))); | 598 ui::Accelerator(ui::VKEY_TAB, ui::EF_ALT_DOWN))); |
| 599 #if defined(OS_CHROMEOS) | 599 #if defined(OS_CHROMEOS) |
| 600 // CycleBackward | 600 // CycleBackward |
| 601 EXPECT_TRUE(ProcessWithContext( | 601 EXPECT_TRUE(ProcessWithContext( |
| 602 ui::Accelerator(ui::VKEY_F5, ui::EF_SHIFT_DOWN))); | 602 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN))); |
| 603 // CycleForward | 603 // CycleForward |
| 604 EXPECT_TRUE(ProcessWithContext( | 604 EXPECT_TRUE(ProcessWithContext( |
| 605 ui::Accelerator(ui::VKEY_F5, ui::EF_NONE))); | 605 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE))); |
| 606 | 606 |
| 607 // Take screenshot / partial screenshot | 607 // Take screenshot / partial screenshot |
| 608 // True should always be returned regardless of the existence of the delegate. | 608 // True should always be returned regardless of the existence of the delegate. |
| 609 { | 609 { |
| 610 EXPECT_TRUE(ProcessWithContext( | 610 EXPECT_TRUE(ProcessWithContext( |
| 611 ui::Accelerator(ui::VKEY_F5, ui::EF_CONTROL_DOWN))); | 611 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN))); |
| 612 EXPECT_TRUE(ProcessWithContext( | 612 EXPECT_TRUE(ProcessWithContext( |
| 613 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); | 613 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); |
| 614 EXPECT_TRUE(ProcessWithContext( | 614 EXPECT_TRUE(ProcessWithContext( |
| 615 ui::Accelerator(ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); | 615 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, |
| 616 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); |
| 616 DummyScreenshotDelegate* delegate = new DummyScreenshotDelegate; | 617 DummyScreenshotDelegate* delegate = new DummyScreenshotDelegate; |
| 617 GetController()->SetScreenshotDelegate( | 618 GetController()->SetScreenshotDelegate( |
| 618 scoped_ptr<ScreenshotDelegate>(delegate).Pass()); | 619 scoped_ptr<ScreenshotDelegate>(delegate).Pass()); |
| 619 EXPECT_EQ(0, delegate->handle_take_screenshot_count()); | 620 EXPECT_EQ(0, delegate->handle_take_screenshot_count()); |
| 620 EXPECT_TRUE(ProcessWithContext( | 621 EXPECT_TRUE(ProcessWithContext( |
| 621 ui::Accelerator(ui::VKEY_F5, ui::EF_CONTROL_DOWN))); | 622 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN))); |
| 622 EXPECT_EQ(1, delegate->handle_take_screenshot_count()); | 623 EXPECT_EQ(1, delegate->handle_take_screenshot_count()); |
| 623 EXPECT_TRUE(ProcessWithContext( | 624 EXPECT_TRUE(ProcessWithContext( |
| 624 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); | 625 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); |
| 625 EXPECT_EQ(2, delegate->handle_take_screenshot_count()); | 626 EXPECT_EQ(2, delegate->handle_take_screenshot_count()); |
| 626 EXPECT_TRUE(ProcessWithContext( | 627 EXPECT_TRUE(ProcessWithContext( |
| 627 ui::Accelerator(ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); | 628 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, |
| 629 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); |
| 628 EXPECT_EQ(2, delegate->handle_take_screenshot_count()); | 630 EXPECT_EQ(2, delegate->handle_take_screenshot_count()); |
| 629 } | 631 } |
| 630 #endif | 632 #endif |
| 631 // ToggleAppList | 633 // ToggleAppList |
| 632 { | 634 { |
| 633 EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); | 635 EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); |
| 634 EXPECT_TRUE(ProcessWithContext( | 636 EXPECT_TRUE(ProcessWithContext( |
| 635 ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE))); | 637 ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE))); |
| 636 EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); | 638 EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); |
| 637 EXPECT_TRUE(ProcessWithContext( | 639 EXPECT_TRUE(ProcessWithContext( |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 704 CapsLockDelegate* delegate = Shell::GetInstance()->caps_lock_delegate(); | 706 CapsLockDelegate* delegate = Shell::GetInstance()->caps_lock_delegate(); |
| 705 delegate->SetCapsLockEnabled(true); | 707 delegate->SetCapsLockEnabled(true); |
| 706 EXPECT_TRUE(delegate->IsCapsLockEnabled()); | 708 EXPECT_TRUE(delegate->IsCapsLockEnabled()); |
| 707 EXPECT_TRUE(ProcessWithContext( | 709 EXPECT_TRUE(ProcessWithContext( |
| 708 ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN))); | 710 ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN))); |
| 709 EXPECT_FALSE(delegate->IsCapsLockEnabled()); | 711 EXPECT_FALSE(delegate->IsCapsLockEnabled()); |
| 710 EXPECT_TRUE(ProcessWithContext( | 712 EXPECT_TRUE(ProcessWithContext( |
| 711 ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN))); | 713 ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN))); |
| 712 EXPECT_TRUE(delegate->IsCapsLockEnabled()); | 714 EXPECT_TRUE(delegate->IsCapsLockEnabled()); |
| 713 } | 715 } |
| 714 #if defined(OS_CHROMEOS) | |
| 715 // Volume | |
| 716 const ui::Accelerator f8(ui::VKEY_F8, ui::EF_NONE); | |
| 717 const ui::Accelerator f9(ui::VKEY_F9, ui::EF_NONE); | |
| 718 const ui::Accelerator f10(ui::VKEY_F10, ui::EF_NONE); | |
| 719 { | |
| 720 EXPECT_TRUE(ProcessWithContext(f8)); | |
| 721 EXPECT_TRUE(ProcessWithContext(f9)); | |
| 722 EXPECT_TRUE(ProcessWithContext(f10)); | |
| 723 DummyVolumeControlDelegate* delegate = | |
| 724 new DummyVolumeControlDelegate(false); | |
| 725 ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( | |
| 726 scoped_ptr<VolumeControlDelegate>(delegate).Pass()); | |
| 727 EXPECT_EQ(0, delegate->handle_volume_mute_count()); | |
| 728 EXPECT_FALSE(ProcessWithContext(f8)); | |
| 729 EXPECT_EQ(1, delegate->handle_volume_mute_count()); | |
| 730 EXPECT_EQ(f8, delegate->last_accelerator()); | |
| 731 EXPECT_EQ(0, delegate->handle_volume_down_count()); | |
| 732 EXPECT_FALSE(ProcessWithContext(f9)); | |
| 733 EXPECT_EQ(1, delegate->handle_volume_down_count()); | |
| 734 EXPECT_EQ(f9, delegate->last_accelerator()); | |
| 735 EXPECT_EQ(0, delegate->handle_volume_up_count()); | |
| 736 EXPECT_FALSE(ProcessWithContext(f10)); | |
| 737 EXPECT_EQ(1, delegate->handle_volume_up_count()); | |
| 738 EXPECT_EQ(f10, delegate->last_accelerator()); | |
| 739 } | |
| 740 { | |
| 741 DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(true); | |
| 742 ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( | |
| 743 scoped_ptr<VolumeControlDelegate>(delegate).Pass()); | |
| 744 EXPECT_EQ(0, delegate->handle_volume_mute_count()); | |
| 745 EXPECT_TRUE(ProcessWithContext(f8)); | |
| 746 EXPECT_EQ(1, delegate->handle_volume_mute_count()); | |
| 747 EXPECT_EQ(f8, delegate->last_accelerator()); | |
| 748 EXPECT_EQ(0, delegate->handle_volume_down_count()); | |
| 749 EXPECT_TRUE(ProcessWithContext(f9)); | |
| 750 EXPECT_EQ(1, delegate->handle_volume_down_count()); | |
| 751 EXPECT_EQ(f9, delegate->last_accelerator()); | |
| 752 EXPECT_EQ(0, delegate->handle_volume_up_count()); | |
| 753 EXPECT_TRUE(ProcessWithContext(f10)); | |
| 754 EXPECT_EQ(1, delegate->handle_volume_up_count()); | |
| 755 EXPECT_EQ(f10, delegate->last_accelerator()); | |
| 756 } | |
| 757 #endif | |
| 758 const ui::Accelerator volume_mute(ui::VKEY_VOLUME_MUTE, ui::EF_NONE); | 716 const ui::Accelerator volume_mute(ui::VKEY_VOLUME_MUTE, ui::EF_NONE); |
| 759 const ui::Accelerator volume_down(ui::VKEY_VOLUME_DOWN, ui::EF_NONE); | 717 const ui::Accelerator volume_down(ui::VKEY_VOLUME_DOWN, ui::EF_NONE); |
| 760 const ui::Accelerator volume_up(ui::VKEY_VOLUME_UP, ui::EF_NONE); | 718 const ui::Accelerator volume_up(ui::VKEY_VOLUME_UP, ui::EF_NONE); |
| 761 { | 719 { |
| 762 DummyVolumeControlDelegate* delegate = | 720 DummyVolumeControlDelegate* delegate = |
| 763 new DummyVolumeControlDelegate(false); | 721 new DummyVolumeControlDelegate(false); |
| 764 ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( | 722 ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( |
| 765 scoped_ptr<VolumeControlDelegate>(delegate).Pass()); | 723 scoped_ptr<VolumeControlDelegate>(delegate).Pass()); |
| 766 EXPECT_EQ(0, delegate->handle_volume_mute_count()); | 724 EXPECT_EQ(0, delegate->handle_volume_mute_count()); |
| 767 EXPECT_FALSE(ProcessWithContext(volume_mute)); | 725 EXPECT_FALSE(ProcessWithContext(volume_mute)); |
| (...skipping 20 matching lines...) Expand all Loading... |
| 788 EXPECT_TRUE(ProcessWithContext(volume_down)); | 746 EXPECT_TRUE(ProcessWithContext(volume_down)); |
| 789 EXPECT_EQ(1, delegate->handle_volume_down_count()); | 747 EXPECT_EQ(1, delegate->handle_volume_down_count()); |
| 790 EXPECT_EQ(volume_down, delegate->last_accelerator()); | 748 EXPECT_EQ(volume_down, delegate->last_accelerator()); |
| 791 EXPECT_EQ(0, delegate->handle_volume_up_count()); | 749 EXPECT_EQ(0, delegate->handle_volume_up_count()); |
| 792 EXPECT_TRUE(ProcessWithContext(volume_up)); | 750 EXPECT_TRUE(ProcessWithContext(volume_up)); |
| 793 EXPECT_EQ(1, delegate->handle_volume_up_count()); | 751 EXPECT_EQ(1, delegate->handle_volume_up_count()); |
| 794 EXPECT_EQ(volume_up, delegate->last_accelerator()); | 752 EXPECT_EQ(volume_up, delegate->last_accelerator()); |
| 795 } | 753 } |
| 796 #if defined(OS_CHROMEOS) | 754 #if defined(OS_CHROMEOS) |
| 797 // Brightness | 755 // Brightness |
| 798 const ui::Accelerator f6(ui::VKEY_F6, ui::EF_NONE); | 756 // ui::VKEY_BRIGHTNESS_DOWN/UP are not defined on Windows. |
| 799 const ui::Accelerator f7(ui::VKEY_F7, ui::EF_NONE); | 757 const ui::Accelerator brightness_down(ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE); |
| 758 const ui::Accelerator brightness_up(ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE); |
| 800 { | 759 { |
| 801 EXPECT_FALSE(ProcessWithContext(f6)); | 760 EXPECT_FALSE(ProcessWithContext(brightness_down)); |
| 802 EXPECT_FALSE(ProcessWithContext(f7)); | 761 EXPECT_FALSE(ProcessWithContext(brightness_up)); |
| 803 DummyBrightnessControlDelegate* delegate = | 762 DummyBrightnessControlDelegate* delegate = |
| 804 new DummyBrightnessControlDelegate(true); | 763 new DummyBrightnessControlDelegate(true); |
| 805 GetController()->SetBrightnessControlDelegate( | 764 GetController()->SetBrightnessControlDelegate( |
| 806 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); | 765 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); |
| 807 EXPECT_FALSE(ProcessWithContext(f6)); | 766 EXPECT_FALSE(ProcessWithContext(brightness_down)); |
| 808 EXPECT_FALSE(ProcessWithContext(f7)); | 767 EXPECT_FALSE(ProcessWithContext(brightness_up)); |
| 809 } | 768 } |
| 810 // Enable internal display. | 769 // Enable internal display. |
| 811 EnableInternalDisplay(); | 770 EnableInternalDisplay(); |
| 812 { | 771 { |
| 813 EXPECT_FALSE(ProcessWithContext(f6)); | |
| 814 EXPECT_FALSE(ProcessWithContext(f7)); | |
| 815 DummyBrightnessControlDelegate* delegate = | 772 DummyBrightnessControlDelegate* delegate = |
| 816 new DummyBrightnessControlDelegate(false); | 773 new DummyBrightnessControlDelegate(false); |
| 817 GetController()->SetBrightnessControlDelegate( | 774 GetController()->SetBrightnessControlDelegate( |
| 818 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); | |
| 819 EXPECT_EQ(0, delegate->handle_brightness_down_count()); | |
| 820 EXPECT_FALSE(ProcessWithContext(f6)); | |
| 821 EXPECT_EQ(1, delegate->handle_brightness_down_count()); | |
| 822 EXPECT_EQ(f6, delegate->last_accelerator()); | |
| 823 EXPECT_EQ(0, delegate->handle_brightness_up_count()); | |
| 824 EXPECT_FALSE(ProcessWithContext(f7)); | |
| 825 EXPECT_EQ(1, delegate->handle_brightness_up_count()); | |
| 826 EXPECT_EQ(f7, delegate->last_accelerator()); | |
| 827 } | |
| 828 { | |
| 829 DummyBrightnessControlDelegate* delegate = | |
| 830 new DummyBrightnessControlDelegate(true); | |
| 831 GetController()->SetBrightnessControlDelegate( | |
| 832 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); | |
| 833 EXPECT_EQ(0, delegate->handle_brightness_down_count()); | |
| 834 EXPECT_TRUE(ProcessWithContext(f6)); | |
| 835 EXPECT_EQ(1, delegate->handle_brightness_down_count()); | |
| 836 EXPECT_EQ(f6, delegate->last_accelerator()); | |
| 837 EXPECT_EQ(0, delegate->handle_brightness_up_count()); | |
| 838 EXPECT_TRUE(ProcessWithContext(f7)); | |
| 839 EXPECT_EQ(1, delegate->handle_brightness_up_count()); | |
| 840 EXPECT_EQ(f7, delegate->last_accelerator()); | |
| 841 } | |
| 842 // ui::VKEY_BRIGHTNESS_DOWN/UP are not defined on Windows. | |
| 843 const ui::Accelerator brightness_down(ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE); | |
| 844 const ui::Accelerator brightness_up(ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE); | |
| 845 { | |
| 846 DummyBrightnessControlDelegate* delegate = | |
| 847 new DummyBrightnessControlDelegate(false); | |
| 848 GetController()->SetBrightnessControlDelegate( | |
| 849 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); | 775 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); |
| 850 EXPECT_EQ(0, delegate->handle_brightness_down_count()); | 776 EXPECT_EQ(0, delegate->handle_brightness_down_count()); |
| 851 EXPECT_FALSE(ProcessWithContext(brightness_down)); | 777 EXPECT_FALSE(ProcessWithContext(brightness_down)); |
| 852 EXPECT_EQ(1, delegate->handle_brightness_down_count()); | 778 EXPECT_EQ(1, delegate->handle_brightness_down_count()); |
| 853 EXPECT_EQ(brightness_down, delegate->last_accelerator()); | 779 EXPECT_EQ(brightness_down, delegate->last_accelerator()); |
| 854 EXPECT_EQ(0, delegate->handle_brightness_up_count()); | 780 EXPECT_EQ(0, delegate->handle_brightness_up_count()); |
| 855 EXPECT_FALSE(ProcessWithContext(brightness_up)); | 781 EXPECT_FALSE(ProcessWithContext(brightness_up)); |
| 856 EXPECT_EQ(1, delegate->handle_brightness_up_count()); | 782 EXPECT_EQ(1, delegate->handle_brightness_up_count()); |
| 857 EXPECT_EQ(brightness_up, delegate->last_accelerator()); | 783 EXPECT_EQ(brightness_up, delegate->last_accelerator()); |
| 858 } | 784 } |
| 859 { | 785 { |
| 860 DummyBrightnessControlDelegate* delegate = | 786 DummyBrightnessControlDelegate* delegate = |
| 861 new DummyBrightnessControlDelegate(true); | 787 new DummyBrightnessControlDelegate(true); |
| 862 GetController()->SetBrightnessControlDelegate( | 788 GetController()->SetBrightnessControlDelegate( |
| 863 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); | 789 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); |
| 864 EXPECT_EQ(0, delegate->handle_brightness_down_count()); | 790 EXPECT_EQ(0, delegate->handle_brightness_down_count()); |
| 865 EXPECT_TRUE(ProcessWithContext(brightness_down)); | 791 EXPECT_TRUE(ProcessWithContext(brightness_down)); |
| 866 EXPECT_EQ(1, delegate->handle_brightness_down_count()); | 792 EXPECT_EQ(1, delegate->handle_brightness_down_count()); |
| 867 EXPECT_EQ(brightness_down, delegate->last_accelerator()); | 793 EXPECT_EQ(brightness_down, delegate->last_accelerator()); |
| 868 EXPECT_EQ(0, delegate->handle_brightness_up_count()); | 794 EXPECT_EQ(0, delegate->handle_brightness_up_count()); |
| 869 EXPECT_TRUE(ProcessWithContext(brightness_up)); | 795 EXPECT_TRUE(ProcessWithContext(brightness_up)); |
| 870 EXPECT_EQ(1, delegate->handle_brightness_up_count()); | 796 EXPECT_EQ(1, delegate->handle_brightness_up_count()); |
| 871 EXPECT_EQ(brightness_up, delegate->last_accelerator()); | 797 EXPECT_EQ(brightness_up, delegate->last_accelerator()); |
| 872 } | 798 } |
| 873 | 799 |
| 874 // Keyboard brightness | 800 // Keyboard brightness |
| 875 const ui::Accelerator alt_f6(ui::VKEY_F6, ui::EF_ALT_DOWN); | 801 const ui::Accelerator alt_brightness_down(ui::VKEY_BRIGHTNESS_DOWN, |
| 876 const ui::Accelerator alt_f7(ui::VKEY_F7, ui::EF_ALT_DOWN); | 802 ui::EF_ALT_DOWN); |
| 803 const ui::Accelerator alt_brightness_up(ui::VKEY_BRIGHTNESS_UP, |
| 804 ui::EF_ALT_DOWN); |
| 877 { | 805 { |
| 878 EXPECT_TRUE(ProcessWithContext(alt_f6)); | 806 EXPECT_TRUE(ProcessWithContext(alt_brightness_down)); |
| 879 EXPECT_TRUE(ProcessWithContext(alt_f7)); | 807 EXPECT_TRUE(ProcessWithContext(alt_brightness_up)); |
| 880 DummyKeyboardBrightnessControlDelegate* delegate = | 808 DummyKeyboardBrightnessControlDelegate* delegate = |
| 881 new DummyKeyboardBrightnessControlDelegate(false); | 809 new DummyKeyboardBrightnessControlDelegate(false); |
| 882 GetController()->SetKeyboardBrightnessControlDelegate( | 810 GetController()->SetKeyboardBrightnessControlDelegate( |
| 883 scoped_ptr<KeyboardBrightnessControlDelegate>(delegate).Pass()); | 811 scoped_ptr<KeyboardBrightnessControlDelegate>(delegate).Pass()); |
| 884 EXPECT_EQ(0, delegate->handle_keyboard_brightness_down_count()); | 812 EXPECT_EQ(0, delegate->handle_keyboard_brightness_down_count()); |
| 885 EXPECT_FALSE(ProcessWithContext(alt_f6)); | 813 EXPECT_FALSE(ProcessWithContext(alt_brightness_down)); |
| 886 EXPECT_EQ(1, delegate->handle_keyboard_brightness_down_count()); | 814 EXPECT_EQ(1, delegate->handle_keyboard_brightness_down_count()); |
| 887 EXPECT_EQ(alt_f6, delegate->last_accelerator()); | 815 EXPECT_EQ(alt_brightness_down, delegate->last_accelerator()); |
| 888 EXPECT_EQ(0, delegate->handle_keyboard_brightness_up_count()); | 816 EXPECT_EQ(0, delegate->handle_keyboard_brightness_up_count()); |
| 889 EXPECT_FALSE(ProcessWithContext(alt_f7)); | 817 EXPECT_FALSE(ProcessWithContext(alt_brightness_up)); |
| 890 EXPECT_EQ(1, delegate->handle_keyboard_brightness_up_count()); | 818 EXPECT_EQ(1, delegate->handle_keyboard_brightness_up_count()); |
| 891 EXPECT_EQ(alt_f7, delegate->last_accelerator()); | 819 EXPECT_EQ(alt_brightness_up, delegate->last_accelerator()); |
| 892 } | 820 } |
| 893 { | 821 { |
| 894 DummyKeyboardBrightnessControlDelegate* delegate = | 822 DummyKeyboardBrightnessControlDelegate* delegate = |
| 895 new DummyKeyboardBrightnessControlDelegate(true); | 823 new DummyKeyboardBrightnessControlDelegate(true); |
| 896 GetController()->SetKeyboardBrightnessControlDelegate( | 824 GetController()->SetKeyboardBrightnessControlDelegate( |
| 897 scoped_ptr<KeyboardBrightnessControlDelegate>(delegate).Pass()); | 825 scoped_ptr<KeyboardBrightnessControlDelegate>(delegate).Pass()); |
| 898 EXPECT_EQ(0, delegate->handle_keyboard_brightness_down_count()); | 826 EXPECT_EQ(0, delegate->handle_keyboard_brightness_down_count()); |
| 899 EXPECT_TRUE(ProcessWithContext(alt_f6)); | 827 EXPECT_TRUE(ProcessWithContext(alt_brightness_down)); |
| 900 EXPECT_EQ(1, delegate->handle_keyboard_brightness_down_count()); | 828 EXPECT_EQ(1, delegate->handle_keyboard_brightness_down_count()); |
| 901 EXPECT_EQ(alt_f6, delegate->last_accelerator()); | 829 EXPECT_EQ(alt_brightness_down, delegate->last_accelerator()); |
| 902 EXPECT_EQ(0, delegate->handle_keyboard_brightness_up_count()); | 830 EXPECT_EQ(0, delegate->handle_keyboard_brightness_up_count()); |
| 903 EXPECT_TRUE(ProcessWithContext(alt_f7)); | 831 EXPECT_TRUE(ProcessWithContext(alt_brightness_up)); |
| 904 EXPECT_EQ(1, delegate->handle_keyboard_brightness_up_count()); | 832 EXPECT_EQ(1, delegate->handle_keyboard_brightness_up_count()); |
| 905 EXPECT_EQ(alt_f7, delegate->last_accelerator()); | 833 EXPECT_EQ(alt_brightness_up, delegate->last_accelerator()); |
| 906 } | 834 } |
| 907 #endif | 835 #endif |
| 908 | 836 |
| 909 #if !defined(NDEBUG) | 837 #if !defined(NDEBUG) |
| 910 // RotateScreen | 838 // RotateScreen |
| 911 EXPECT_TRUE(ProcessWithContext( | 839 EXPECT_TRUE(ProcessWithContext( |
| 912 ui::Accelerator(ui::VKEY_HOME, ui::EF_CONTROL_DOWN))); | 840 ui::Accelerator(ui::VKEY_HOME, ui::EF_CONTROL_DOWN))); |
| 913 // ToggleDesktopBackgroundMode | 841 // ToggleDesktopBackgroundMode |
| 914 EXPECT_TRUE(ProcessWithContext( | 842 EXPECT_TRUE(ProcessWithContext( |
| 915 ui::Accelerator(ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN))); | 843 ui::Accelerator(ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN))); |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1155 EXPECT_TRUE(GetController()->PerformAction(*it, dummy)) | 1083 EXPECT_TRUE(GetController()->PerformAction(*it, dummy)) |
| 1156 << " for action (disallowed at modal window): " << *it; | 1084 << " for action (disallowed at modal window): " << *it; |
| 1157 } | 1085 } |
| 1158 } | 1086 } |
| 1159 // Testing of top row (F5-F10) accelerators that should still work | 1087 // Testing of top row (F5-F10) accelerators that should still work |
| 1160 // when a modal window is open | 1088 // when a modal window is open |
| 1161 // | 1089 // |
| 1162 // Screenshot | 1090 // Screenshot |
| 1163 { | 1091 { |
| 1164 EXPECT_TRUE(ProcessWithContext( | 1092 EXPECT_TRUE(ProcessWithContext( |
| 1165 ui::Accelerator(ui::VKEY_F5, ui::EF_CONTROL_DOWN))); | 1093 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN))); |
| 1166 EXPECT_TRUE(ProcessWithContext( | 1094 EXPECT_TRUE(ProcessWithContext( |
| 1167 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); | 1095 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); |
| 1168 EXPECT_TRUE(ProcessWithContext( | 1096 EXPECT_TRUE(ProcessWithContext( |
| 1169 ui::Accelerator(ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); | 1097 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, |
| 1098 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); |
| 1170 DummyScreenshotDelegate* delegate = new DummyScreenshotDelegate; | 1099 DummyScreenshotDelegate* delegate = new DummyScreenshotDelegate; |
| 1171 GetController()->SetScreenshotDelegate( | 1100 GetController()->SetScreenshotDelegate( |
| 1172 scoped_ptr<ScreenshotDelegate>(delegate).Pass()); | 1101 scoped_ptr<ScreenshotDelegate>(delegate).Pass()); |
| 1173 EXPECT_EQ(0, delegate->handle_take_screenshot_count()); | 1102 EXPECT_EQ(0, delegate->handle_take_screenshot_count()); |
| 1174 EXPECT_TRUE(ProcessWithContext( | 1103 EXPECT_TRUE(ProcessWithContext( |
| 1175 ui::Accelerator(ui::VKEY_F5, ui::EF_CONTROL_DOWN))); | 1104 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN))); |
| 1176 EXPECT_EQ(1, delegate->handle_take_screenshot_count()); | 1105 EXPECT_EQ(1, delegate->handle_take_screenshot_count()); |
| 1177 EXPECT_TRUE(ProcessWithContext( | 1106 EXPECT_TRUE(ProcessWithContext( |
| 1178 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); | 1107 ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE))); |
| 1179 EXPECT_EQ(2, delegate->handle_take_screenshot_count()); | 1108 EXPECT_EQ(2, delegate->handle_take_screenshot_count()); |
| 1180 EXPECT_TRUE(ProcessWithContext( | 1109 EXPECT_TRUE(ProcessWithContext( |
| 1181 ui::Accelerator(ui::VKEY_F5, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); | 1110 ui::Accelerator(ui::VKEY_MEDIA_LAUNCH_APP1, |
| 1111 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); |
| 1182 EXPECT_EQ(2, delegate->handle_take_screenshot_count()); | 1112 EXPECT_EQ(2, delegate->handle_take_screenshot_count()); |
| 1183 } | 1113 } |
| 1184 // Brightness | 1114 // Brightness |
| 1185 const ui::Accelerator f6(ui::VKEY_F6, ui::EF_NONE); | 1115 const ui::Accelerator brightness_down(ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE); |
| 1186 const ui::Accelerator f7(ui::VKEY_F7, ui::EF_NONE); | 1116 const ui::Accelerator brightness_up(ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE); |
| 1187 { | 1117 { |
| 1188 EXPECT_FALSE(ProcessWithContext(f6)); | 1118 EXPECT_FALSE(ProcessWithContext(brightness_down)); |
| 1189 EXPECT_FALSE(ProcessWithContext(f7)); | 1119 EXPECT_FALSE(ProcessWithContext(brightness_up)); |
| 1190 DummyBrightnessControlDelegate* delegate = | 1120 DummyBrightnessControlDelegate* delegate = |
| 1191 new DummyBrightnessControlDelegate(true); | 1121 new DummyBrightnessControlDelegate(true); |
| 1192 GetController()->SetBrightnessControlDelegate( | 1122 GetController()->SetBrightnessControlDelegate( |
| 1193 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); | 1123 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); |
| 1194 EXPECT_FALSE(ProcessWithContext(f6)); | 1124 EXPECT_FALSE(ProcessWithContext(brightness_down)); |
| 1195 EXPECT_FALSE(ProcessWithContext(f7)); | 1125 EXPECT_FALSE(ProcessWithContext(brightness_up)); |
| 1196 } | 1126 } |
| 1197 EnableInternalDisplay(); | 1127 EnableInternalDisplay(); |
| 1198 { | 1128 { |
| 1199 EXPECT_FALSE(ProcessWithContext(f6)); | 1129 EXPECT_FALSE(ProcessWithContext(brightness_down)); |
| 1200 EXPECT_FALSE(ProcessWithContext(f7)); | 1130 EXPECT_FALSE(ProcessWithContext(brightness_up)); |
| 1201 DummyBrightnessControlDelegate* delegate = | 1131 DummyBrightnessControlDelegate* delegate = |
| 1202 new DummyBrightnessControlDelegate(false); | 1132 new DummyBrightnessControlDelegate(false); |
| 1203 GetController()->SetBrightnessControlDelegate( | 1133 GetController()->SetBrightnessControlDelegate( |
| 1204 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); | 1134 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); |
| 1205 EXPECT_EQ(0, delegate->handle_brightness_down_count()); | 1135 EXPECT_EQ(0, delegate->handle_brightness_down_count()); |
| 1206 EXPECT_FALSE(ProcessWithContext(f6)); | 1136 EXPECT_FALSE(ProcessWithContext(brightness_down)); |
| 1207 EXPECT_EQ(1, delegate->handle_brightness_down_count()); | 1137 EXPECT_EQ(1, delegate->handle_brightness_down_count()); |
| 1208 EXPECT_EQ(f6, delegate->last_accelerator()); | 1138 EXPECT_EQ(brightness_down, delegate->last_accelerator()); |
| 1209 EXPECT_EQ(0, delegate->handle_brightness_up_count()); | 1139 EXPECT_EQ(0, delegate->handle_brightness_up_count()); |
| 1210 EXPECT_FALSE(ProcessWithContext(f7)); | 1140 EXPECT_FALSE(ProcessWithContext(brightness_up)); |
| 1211 EXPECT_EQ(1, delegate->handle_brightness_up_count()); | 1141 EXPECT_EQ(1, delegate->handle_brightness_up_count()); |
| 1212 EXPECT_EQ(f7, delegate->last_accelerator()); | 1142 EXPECT_EQ(brightness_up, delegate->last_accelerator()); |
| 1213 } | 1143 } |
| 1214 { | 1144 { |
| 1215 DummyBrightnessControlDelegate* delegate = | 1145 DummyBrightnessControlDelegate* delegate = |
| 1216 new DummyBrightnessControlDelegate(true); | 1146 new DummyBrightnessControlDelegate(true); |
| 1217 GetController()->SetBrightnessControlDelegate( | 1147 GetController()->SetBrightnessControlDelegate( |
| 1218 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); | 1148 scoped_ptr<BrightnessControlDelegate>(delegate).Pass()); |
| 1219 EXPECT_EQ(0, delegate->handle_brightness_down_count()); | 1149 EXPECT_EQ(0, delegate->handle_brightness_down_count()); |
| 1220 EXPECT_TRUE(ProcessWithContext(f6)); | 1150 EXPECT_TRUE(ProcessWithContext(brightness_down)); |
| 1221 EXPECT_EQ(1, delegate->handle_brightness_down_count()); | 1151 EXPECT_EQ(1, delegate->handle_brightness_down_count()); |
| 1222 EXPECT_EQ(f6, delegate->last_accelerator()); | 1152 EXPECT_EQ(brightness_down, delegate->last_accelerator()); |
| 1223 EXPECT_EQ(0, delegate->handle_brightness_up_count()); | 1153 EXPECT_EQ(0, delegate->handle_brightness_up_count()); |
| 1224 EXPECT_TRUE(ProcessWithContext(f7)); | 1154 EXPECT_TRUE(ProcessWithContext(brightness_up)); |
| 1225 EXPECT_EQ(1, delegate->handle_brightness_up_count()); | 1155 EXPECT_EQ(1, delegate->handle_brightness_up_count()); |
| 1226 EXPECT_EQ(f7, delegate->last_accelerator()); | 1156 EXPECT_EQ(brightness_up, delegate->last_accelerator()); |
| 1227 } | 1157 } |
| 1228 // Volume | 1158 // Volume |
| 1229 const ui::Accelerator f8(ui::VKEY_F8, ui::EF_NONE); | 1159 const ui::Accelerator volume_mute(ui::VKEY_VOLUME_MUTE, ui::EF_NONE); |
| 1230 const ui::Accelerator f9(ui::VKEY_F9, ui::EF_NONE); | 1160 const ui::Accelerator volume_down(ui::VKEY_VOLUME_DOWN, ui::EF_NONE); |
| 1231 const ui::Accelerator f10(ui::VKEY_F10, ui::EF_NONE); | 1161 const ui::Accelerator volume_up(ui::VKEY_VOLUME_UP, ui::EF_NONE); |
| 1232 { | 1162 { |
| 1233 EXPECT_TRUE(ProcessWithContext(f8)); | 1163 EXPECT_TRUE(ProcessWithContext(volume_mute)); |
| 1234 EXPECT_TRUE(ProcessWithContext(f9)); | 1164 EXPECT_TRUE(ProcessWithContext(volume_down)); |
| 1235 EXPECT_TRUE(ProcessWithContext(f10)); | 1165 EXPECT_TRUE(ProcessWithContext(volume_up)); |
| 1236 DummyVolumeControlDelegate* delegate = | 1166 DummyVolumeControlDelegate* delegate = |
| 1237 new DummyVolumeControlDelegate(false); | 1167 new DummyVolumeControlDelegate(false); |
| 1238 ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( | 1168 ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( |
| 1239 scoped_ptr<VolumeControlDelegate>(delegate).Pass()); | 1169 scoped_ptr<VolumeControlDelegate>(delegate).Pass()); |
| 1240 EXPECT_EQ(0, delegate->handle_volume_mute_count()); | 1170 EXPECT_EQ(0, delegate->handle_volume_mute_count()); |
| 1241 EXPECT_FALSE(ProcessWithContext(f8)); | 1171 EXPECT_FALSE(ProcessWithContext(volume_mute)); |
| 1242 EXPECT_EQ(1, delegate->handle_volume_mute_count()); | 1172 EXPECT_EQ(1, delegate->handle_volume_mute_count()); |
| 1243 EXPECT_EQ(f8, delegate->last_accelerator()); | 1173 EXPECT_EQ(volume_mute, delegate->last_accelerator()); |
| 1244 EXPECT_EQ(0, delegate->handle_volume_down_count()); | 1174 EXPECT_EQ(0, delegate->handle_volume_down_count()); |
| 1245 EXPECT_FALSE(ProcessWithContext(f9)); | 1175 EXPECT_FALSE(ProcessWithContext(volume_down)); |
| 1246 EXPECT_EQ(1, delegate->handle_volume_down_count()); | 1176 EXPECT_EQ(1, delegate->handle_volume_down_count()); |
| 1247 EXPECT_EQ(f9, delegate->last_accelerator()); | 1177 EXPECT_EQ(volume_down, delegate->last_accelerator()); |
| 1248 EXPECT_EQ(0, delegate->handle_volume_up_count()); | 1178 EXPECT_EQ(0, delegate->handle_volume_up_count()); |
| 1249 EXPECT_FALSE(ProcessWithContext(f10)); | 1179 EXPECT_FALSE(ProcessWithContext(volume_up)); |
| 1250 EXPECT_EQ(1, delegate->handle_volume_up_count()); | 1180 EXPECT_EQ(1, delegate->handle_volume_up_count()); |
| 1251 EXPECT_EQ(f10, delegate->last_accelerator()); | 1181 EXPECT_EQ(volume_up, delegate->last_accelerator()); |
| 1252 } | 1182 } |
| 1253 { | 1183 { |
| 1254 DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(true); | 1184 DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(true); |
| 1255 ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( | 1185 ash::Shell::GetInstance()->tray_delegate()->SetVolumeControlDelegate( |
| 1256 scoped_ptr<VolumeControlDelegate>(delegate).Pass()); | 1186 scoped_ptr<VolumeControlDelegate>(delegate).Pass()); |
| 1257 EXPECT_EQ(0, delegate->handle_volume_mute_count()); | 1187 EXPECT_EQ(0, delegate->handle_volume_mute_count()); |
| 1258 EXPECT_TRUE(ProcessWithContext(f8)); | 1188 EXPECT_TRUE(ProcessWithContext(volume_mute)); |
| 1259 EXPECT_EQ(1, delegate->handle_volume_mute_count()); | 1189 EXPECT_EQ(1, delegate->handle_volume_mute_count()); |
| 1260 EXPECT_EQ(f8, delegate->last_accelerator()); | 1190 EXPECT_EQ(volume_mute, delegate->last_accelerator()); |
| 1261 EXPECT_EQ(0, delegate->handle_volume_down_count()); | 1191 EXPECT_EQ(0, delegate->handle_volume_down_count()); |
| 1262 EXPECT_TRUE(ProcessWithContext(f9)); | 1192 EXPECT_TRUE(ProcessWithContext(volume_down)); |
| 1263 EXPECT_EQ(1, delegate->handle_volume_down_count()); | 1193 EXPECT_EQ(1, delegate->handle_volume_down_count()); |
| 1264 EXPECT_EQ(f9, delegate->last_accelerator()); | 1194 EXPECT_EQ(volume_down, delegate->last_accelerator()); |
| 1265 EXPECT_EQ(0, delegate->handle_volume_up_count()); | 1195 EXPECT_EQ(0, delegate->handle_volume_up_count()); |
| 1266 EXPECT_TRUE(ProcessWithContext(f10)); | 1196 EXPECT_TRUE(ProcessWithContext(volume_up)); |
| 1267 EXPECT_EQ(1, delegate->handle_volume_up_count()); | 1197 EXPECT_EQ(1, delegate->handle_volume_up_count()); |
| 1268 EXPECT_EQ(f10, delegate->last_accelerator()); | 1198 EXPECT_EQ(volume_up, delegate->last_accelerator()); |
| 1269 } | 1199 } |
| 1270 } | 1200 } |
| 1271 #endif | 1201 #endif |
| 1272 | 1202 |
| 1273 } // namespace ash | 1203 } // namespace ash |
| OLD | NEW |