diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-17 04:02:28 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-17 04:02:28 +0000 |
| commit | 8e9640202a8844c489545a85732d4a1fd3690fdc (patch) | |
| tree | 92805d610a3cd3ac0f19bba529842fd3c09d2c38 /ui | |
| parent | f788312bcedbc519cebbe0f9952ebed8f160c72d (diff) | |
| download | chromium_src-8e9640202a8844c489545a85732d4a1fd3690fdc.zip chromium_src-8e9640202a8844c489545a85732d4a1fd3690fdc.tar.gz chromium_src-8e9640202a8844c489545a85732d4a1fd3690fdc.tar.bz2 | |
Assign F5 to cycle forward.
Also uncomment the tests for cycle forward/backward.
BUG=107417
TEST=Manual test and aura_shell_unittests
Review URL: http://codereview.chromium.org/8934020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114911 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura_shell/shell_accelerator_controller.cc | 1 | ||||
| -rw-r--r-- | ui/aura_shell/shell_accelerator_controller_unittest.cc | 22 |
2 files changed, 18 insertions, 5 deletions
diff --git a/ui/aura_shell/shell_accelerator_controller.cc b/ui/aura_shell/shell_accelerator_controller.cc index 2089994..2ec1739 100644 --- a/ui/aura_shell/shell_accelerator_controller.cc +++ b/ui/aura_shell/shell_accelerator_controller.cc @@ -42,6 +42,7 @@ struct AcceleratorData { } kAcceleratorData[] = { { ui::VKEY_TAB, true, false, true, CYCLE_BACKWARD }, { ui::VKEY_TAB, false, false, true, CYCLE_FORWARD }, + { ui::VKEY_F5, false, false, false, CYCLE_FORWARD }, { ui::VKEY_F5, false, true, false, TAKE_SCREENSHOT }, { ui::VKEY_PRINT, false, false, false, TAKE_SCREENSHOT }, #if !defined(NDEBUG) diff --git a/ui/aura_shell/shell_accelerator_controller_unittest.cc b/ui/aura_shell/shell_accelerator_controller_unittest.cc index d82d33f..c2bb8a0 100644 --- a/ui/aura_shell/shell_accelerator_controller_unittest.cc +++ b/ui/aura_shell/shell_accelerator_controller_unittest.cc @@ -184,13 +184,25 @@ TEST_F(ShellAcceleratorControllerTest, ProcessOnce) { #endif TEST_F(ShellAcceleratorControllerTest, GlobalAccelerators) { - // TODO(mazda): Uncomment the followings once they are implemented. + // A focused window must exist for accelerators to be processed. + aura::Window* default_container = + aura_shell::Shell::GetInstance()->GetContainer( + internal::kShellWindowId_DefaultContainer); + aura::Window* window = aura::test::CreateTestWindowWithDelegate( + new aura::test::TestWindowDelegate, + -1, + gfx::Rect(), + default_container); + ActivateWindow(window); + // CycleBackward - // EXPECT_TRUE(GetController()->Process( - // ui::Accelerator(ui::VKEY_TAB, true, false, true))); + EXPECT_TRUE(GetController()->Process( + ui::Accelerator(ui::VKEY_TAB, true, false, true))); // CycleForwrard - // EXPECT_TRUE(GetController()->Process( - // ui::Accelerator(ui::VKEY_TAB, false, false, true))); + EXPECT_TRUE(GetController()->Process( + ui::Accelerator(ui::VKEY_F5, false, false, false))); + EXPECT_TRUE(GetController()->Process( + ui::Accelerator(ui::VKEY_TAB, false, false, true))); // TakeScreenshot // EXPECT_TRUE(GetController()->Process( // ui::Accelerator(ui::VKEY_F5, false, true, false))); |