diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 23:11:00 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 23:11:00 +0000 |
| commit | a934ece52fddea9e430d724c26ccbe76b4806809 (patch) | |
| tree | 6cd5efc9e597a575fd1a7d6ba454b4718e409439 /ash/accelerators | |
| parent | fc647bc7259aa871e38853715c3d69702f048eb1 (diff) | |
| download | chromium_src-a934ece52fddea9e430d724c26ccbe76b4806809.zip chromium_src-a934ece52fddea9e430d724c26ccbe76b4806809.tar.gz chromium_src-a934ece52fddea9e430d724c26ccbe76b4806809.tar.bz2 | |
Fix and re-enable AcceleratorControllerTest.GlobalAccelerator.
BUG=127538
TEST=aura_shell_unittests --gtest_filter="AcceleratorControllerTest.GlobalAccelerator"
Review URL: https://chromiumcodereview.appspot.com/10541127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index ff0e56b..d62d6e9 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -486,8 +486,7 @@ TEST_F(AcceleratorControllerTest, ProcessOnce) { } #endif -// Disabled due to a real bug, see http://crbug.com/127538. -TEST_F(AcceleratorControllerTest, DISABLED_GlobalAccelerators) { +TEST_F(AcceleratorControllerTest, GlobalAccelerators) { // CycleBackward EXPECT_TRUE(GetController()->Process( ui::Accelerator(ui::VKEY_F5, ui::EF_CONTROL_DOWN))); @@ -529,10 +528,10 @@ TEST_F(AcceleratorControllerTest, DISABLED_GlobalAccelerators) { { EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); EXPECT_TRUE(GetController()->Process( - ui::Accelerator(ui::VKEY_LWIN, ui::EF_CONTROL_DOWN))); + ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE))); EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); EXPECT_TRUE(GetController()->Process( - ui::Accelerator(ui::VKEY_LWIN, ui::EF_CONTROL_DOWN))); + ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE))); EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); } // ToggleCapsLock @@ -722,7 +721,7 @@ TEST_F(AcceleratorControllerTest, DISABLED_GlobalAccelerators) { // New tab EXPECT_TRUE(GetController()->Process( - ui::Accelerator(ui::VKEY_T, ui::EF_SHIFT_DOWN))); + ui::Accelerator(ui::VKEY_T, ui::EF_CONTROL_DOWN))); // New incognito window EXPECT_TRUE(GetController()->Process( @@ -732,11 +731,6 @@ TEST_F(AcceleratorControllerTest, DISABLED_GlobalAccelerators) { EXPECT_TRUE(GetController()->Process( ui::Accelerator(ui::VKEY_N, ui::EF_CONTROL_DOWN))); -#if defined(OS_CHROMEOS) - EXPECT_TRUE(GetController()->Process( - ui::Accelerator(ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); -#endif - // Restore tab EXPECT_TRUE(GetController()->Process( ui::Accelerator(ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); @@ -744,6 +738,15 @@ TEST_F(AcceleratorControllerTest, DISABLED_GlobalAccelerators) { // Show task manager EXPECT_TRUE(GetController()->Process( ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN))); + +#if defined(OS_CHROMEOS) + // Lock screen + // NOTE: Accelerators that do not work on the lock screen need to be + // tested before the sequence below is invoked because it causes a side + // effect of locking the screen. + EXPECT_TRUE(GetController()->Process( + ui::Accelerator(ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); +#endif } TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) { |