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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 10155015: Process all global shortcuts for Ash after InputMethodEventFilter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, address comments Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 7d88bdb4a56df92a764e9062fa156b9c1b111f98..c543edc8aecfc716d2caa0e63253253d566e4bb9 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -51,32 +51,12 @@ class TestTarget : public ui::AcceleratorTarget {
DISALLOW_COPY_AND_ASSIGN(TestTarget);
};
-class PostImeAccelerator : public ui::Accelerator {
+class ReleaseAccelerator : public ui::Accelerator {
public:
- PostImeAccelerator(ui::KeyboardCode keycode,
- bool shift_pressed, bool ctrl_pressed, bool alt_pressed)
- : ui::Accelerator(keycode, shift_pressed, ctrl_pressed, alt_pressed) {
- set_type(ui::ET_TRANSLATED_KEY_PRESS);
- }
-};
-typedef ui::Accelerator PreImeAccelerator;
-
-class PostImeReleaseAccelerator : public ui::Accelerator {
- public:
- PostImeReleaseAccelerator(ui::KeyboardCode keycode,
- bool shift_pressed,
- bool ctrl_pressed,
- bool alt_pressed)
- : ui::Accelerator(keycode, shift_pressed, ctrl_pressed, alt_pressed) {
- set_type(ui::ET_TRANSLATED_KEY_RELEASE);
- }
-};
-class PreImeReleaseAccelerator : public ui::Accelerator {
- public:
- PreImeReleaseAccelerator(ui::KeyboardCode keycode,
- bool shift_pressed,
- bool ctrl_pressed,
- bool alt_pressed)
+ ReleaseAccelerator(ui::KeyboardCode keycode,
+ bool shift_pressed,
+ bool ctrl_pressed,
+ bool alt_pressed)
: ui::Accelerator(keycode, shift_pressed, ctrl_pressed, alt_pressed) {
set_type(ui::ET_KEY_RELEASED);
}
@@ -385,7 +365,7 @@ TEST_F(AcceleratorControllerTest, Process) {
#if defined(OS_WIN) || defined(USE_X11)
TEST_F(AcceleratorControllerTest, ProcessOnce) {
- PostImeAccelerator accelerator_a(ui::VKEY_A, false, false, false);
+ ui::Accelerator accelerator_a(ui::VKEY_A, false, false, false);
TestTarget target;
GetController()->Register(accelerator_a, &target);
@@ -428,51 +408,51 @@ TEST_F(AcceleratorControllerTest, ProcessOnce) {
TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
// CycleBackward
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_F5, true, false, false)));
+ ui::Accelerator(ui::VKEY_F5, true, false, false)));
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_TAB, true, false, true)));
+ ui::Accelerator(ui::VKEY_TAB, true, false, true)));
// CycleForward
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_F5, false, false, false)));
+ ui::Accelerator(ui::VKEY_F5, false, false, false)));
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_TAB, false, false, true)));
+ ui::Accelerator(ui::VKEY_TAB, false, false, true)));
// Take screenshot / partial screenshot
// True should always be returned regardless of the existence of the delegate.
{
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_F5, false, true, false)));
+ ui::Accelerator(ui::VKEY_F5, false, true, false)));
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_PRINT, false, false, false)));
+ ui::Accelerator(ui::VKEY_PRINT, false, false, false)));
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_F5, true, true, false)));
+ ui::Accelerator(ui::VKEY_F5, true, true, false)));
DummyScreenshotDelegate* delegate = new DummyScreenshotDelegate;
GetController()->SetScreenshotDelegate(
scoped_ptr<ScreenshotDelegate>(delegate).Pass());
EXPECT_EQ(0, delegate->handle_take_screenshot_count());
EXPECT_EQ(0, delegate->handle_take_partial_screenshot_count());
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_F5, false, true, false)));
+ ui::Accelerator(ui::VKEY_F5, false, true, false)));
EXPECT_EQ(1, delegate->handle_take_screenshot_count());
EXPECT_EQ(0, delegate->handle_take_partial_screenshot_count());
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_PRINT, false, false, false)));
+ ui::Accelerator(ui::VKEY_PRINT, false, false, false)));
EXPECT_EQ(2, delegate->handle_take_screenshot_count());
EXPECT_EQ(0, delegate->handle_take_partial_screenshot_count());
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_F5, true, true, false)));
+ ui::Accelerator(ui::VKEY_F5, true, true, false)));
EXPECT_EQ(2, delegate->handle_take_screenshot_count());
EXPECT_EQ(1, delegate->handle_take_partial_screenshot_count());
}
// ToggleCapsLock
{
EXPECT_FALSE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_LWIN, true, false, false)));
+ ui::Accelerator(ui::VKEY_LWIN, true, false, false)));
DummyCapsLockDelegate* delegate = new DummyCapsLockDelegate(false);
GetController()->SetCapsLockDelegate(
scoped_ptr<CapsLockDelegate>(delegate).Pass());
EXPECT_EQ(0, delegate->handle_caps_lock_count());
EXPECT_FALSE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_LWIN, true, false, false)));
+ ui::Accelerator(ui::VKEY_LWIN, true, false, false)));
EXPECT_EQ(1, delegate->handle_caps_lock_count());
}
{
@@ -481,13 +461,13 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
scoped_ptr<CapsLockDelegate>(delegate).Pass());
EXPECT_EQ(0, delegate->handle_caps_lock_count());
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_LWIN, true, false, false)));
+ ui::Accelerator(ui::VKEY_LWIN, true, false, false)));
EXPECT_EQ(1, delegate->handle_caps_lock_count());
}
// Volume
- const PostImeAccelerator f8(ui::VKEY_F8, false, false, false);
- const PostImeAccelerator f9(ui::VKEY_F9, false, false, false);
- const PostImeAccelerator f10(ui::VKEY_F10, false, false, false);
+ const ui::Accelerator f8(ui::VKEY_F8, false, false, false);
+ const ui::Accelerator f9(ui::VKEY_F9, false, false, false);
+ const ui::Accelerator f10(ui::VKEY_F10, false, false, false);
{
EXPECT_FALSE(GetController()->Process(f8));
EXPECT_FALSE(GetController()->Process(f9));
@@ -526,11 +506,11 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
EXPECT_EQ(1, delegate->handle_volume_up_count());
EXPECT_EQ(f10, delegate->last_accelerator());
}
- const PostImeAccelerator volume_mute(
+ const ui::Accelerator volume_mute(
ui::VKEY_VOLUME_MUTE, false, false, false);
- const PostImeAccelerator volume_down(
+ const ui::Accelerator volume_down(
ui::VKEY_VOLUME_DOWN, false, false, false);
- const PostImeAccelerator volume_up(ui::VKEY_VOLUME_UP, false, false, false);
+ const ui::Accelerator volume_up(ui::VKEY_VOLUME_UP, false, false, false);
{
DummyVolumeControlDelegate* delegate =
new DummyVolumeControlDelegate(false);
@@ -567,8 +547,8 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
EXPECT_EQ(volume_up, delegate->last_accelerator());
}
// Brightness
- const PostImeAccelerator f6(ui::VKEY_F6, false, false, false);
- const PostImeAccelerator f7(ui::VKEY_F7, false, false, false);
+ const ui::Accelerator f6(ui::VKEY_F6, false, false, false);
+ const ui::Accelerator f7(ui::VKEY_F7, false, false, false);
{
EXPECT_FALSE(GetController()->Process(f6));
EXPECT_FALSE(GetController()->Process(f7));
@@ -601,9 +581,9 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
}
#if defined(OS_CHROMEOS)
// ui::VKEY_BRIGHTNESS_DOWN/UP are not defined on Windows.
- const PostImeAccelerator brightness_down(
+ const ui::Accelerator brightness_down(
ui::VKEY_BRIGHTNESS_DOWN, false, false, false);
- const PostImeAccelerator brightness_up(
+ const ui::Accelerator brightness_up(
ui::VKEY_BRIGHTNESS_UP, false, false, false);
{
DummyBrightnessControlDelegate* delegate =
@@ -637,50 +617,36 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
#if !defined(NDEBUG)
// RotateScreen
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_HOME, false, true, false)));
+ ui::Accelerator(ui::VKEY_HOME, false, true, false)));
// ToggleDesktopBackgroundMode
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_B, false, true, true)));
+ ui::Accelerator(ui::VKEY_B, false, true, true)));
#if !defined(OS_LINUX)
// ToggleDesktopFullScreen (not implemented yet on Linux)
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_F11, false, true, false)));
+ ui::Accelerator(ui::VKEY_F11, false, true, false)));
#endif // OS_LINUX
#endif // !NDEBUG
// Exit
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_Q, true, true ,false)));
+ ui::Accelerator(ui::VKEY_Q, true, true ,false)));
// New incognito window
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_N, true, true, false)));
+ ui::Accelerator(ui::VKEY_N, true, true, false)));
// New window
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_N, false, true, false)));
+ ui::Accelerator(ui::VKEY_N, false, true, false)));
#if defined(OS_CHROMEOS)
EXPECT_TRUE(GetController()->Process(
- PostImeAccelerator(ui::VKEY_L, true, true, false)));
+ ui::Accelerator(ui::VKEY_L, true, true, false)));
#endif
}
-TEST_F(AcceleratorControllerTest, GlobalAcceleratorsPreIme) {
- // Make sure post-IME shortcuts are ignored in the pre-IME phase.
- {
- const PreImeAccelerator f8(ui::VKEY_F8, false, false, false);
- const PostImeAccelerator f8_post(ui::VKEY_F8, false, false, false);
- DummyVolumeControlDelegate* delegate = new DummyVolumeControlDelegate(true);
- GetController()->SetVolumeControlDelegate(
- scoped_ptr<VolumeControlDelegate>(delegate).Pass());
- EXPECT_EQ(0, delegate->handle_volume_mute_count());
- EXPECT_FALSE(GetController()->Process(f8));
- EXPECT_EQ(0, delegate->handle_volume_mute_count());
- EXPECT_TRUE(GetController()->Process(f8_post));
- EXPECT_EQ(1, delegate->handle_volume_mute_count());
- }
-
+TEST_F(AcceleratorControllerTest, ImeGlobalAccelerators) {
// Test IME shortcuts.
{
const ui::Accelerator control_space(ui::VKEY_SPACE, false, true, false);
@@ -718,79 +684,34 @@ TEST_F(AcceleratorControllerTest, GlobalAcceleratorsPreIme) {
EXPECT_EQ(5, delegate->handle_switch_ime_count());
EXPECT_TRUE(GetController()->Process(shift_space));
EXPECT_EQ(6, delegate->handle_switch_ime_count());
-
- // Make sure pre-IME shortcuts are ignored in the post-IME phase.
- const PostImeAccelerator control_space_post(
- ui::VKEY_SPACE, false, true, false);
- const PostImeAccelerator convert_post(
- ui::VKEY_CONVERT, false, false, false);
- const PostImeAccelerator non_convert_post(
- ui::VKEY_NONCONVERT, false, false, false);
- const PostImeAccelerator wide_half_1_post(
- ui::VKEY_DBE_SBCSCHAR, false, false, false);
- const PostImeAccelerator wide_half_2_post(
- ui::VKEY_DBE_DBCSCHAR, false, false, false);
- const PostImeAccelerator hangul_post(ui::VKEY_HANGUL, false, false, false);
- const PostImeAccelerator shift_space_post(
- ui::VKEY_SPACE, true, false, false);
- EXPECT_EQ(1, delegate->handle_previous_ime_count());
- EXPECT_FALSE(GetController()->Process(control_space_post));
- EXPECT_EQ(1, delegate->handle_previous_ime_count());
- EXPECT_EQ(6, delegate->handle_switch_ime_count());
- EXPECT_FALSE(GetController()->Process(convert_post));
- EXPECT_EQ(6, delegate->handle_switch_ime_count());
- EXPECT_FALSE(GetController()->Process(non_convert_post));
- EXPECT_EQ(6, delegate->handle_switch_ime_count());
- EXPECT_FALSE(GetController()->Process(wide_half_1_post));
- EXPECT_EQ(6, delegate->handle_switch_ime_count());
- EXPECT_FALSE(GetController()->Process(wide_half_2_post));
- EXPECT_EQ(6, delegate->handle_switch_ime_count());
- EXPECT_FALSE(GetController()->Process(hangul_post));
- EXPECT_EQ(6, delegate->handle_switch_ime_count());
- EXPECT_FALSE(GetController()->Process(shift_space_post));
- EXPECT_EQ(6, delegate->handle_switch_ime_count());
}
// Test IME shortcuts that are triggered on key release.
{
- const PreImeAccelerator shift_alt_press(ui::VKEY_MENU, true, false, true);
- const PostImeAccelerator shift_alt_press_post(
- ui::VKEY_MENU, true, false, true);
- const PreImeReleaseAccelerator shift_alt(ui::VKEY_MENU, true, false, true);
-
- const PreImeAccelerator alt_shift_press(ui::VKEY_SHIFT, true, false, true);
- const PostImeAccelerator alt_shift_press_post(
- ui::VKEY_SHIFT, true, false, true);
- const PreImeReleaseAccelerator alt_shift(ui::VKEY_SHIFT, true, false, true);
+ const ui::Accelerator shift_alt_press(ui::VKEY_MENU, true, false, true);
+ const ReleaseAccelerator shift_alt(ui::VKEY_MENU, true, false, true);
+ const ui::Accelerator alt_shift_press(ui::VKEY_SHIFT, true, false, true);
+ const ReleaseAccelerator alt_shift(ui::VKEY_SHIFT, true, false, true);
DummyImeControlDelegate* delegate = new DummyImeControlDelegate(true);
GetController()->SetImeControlDelegate(
scoped_ptr<ImeControlDelegate>(delegate).Pass());
EXPECT_EQ(0, delegate->handle_next_ime_count());
EXPECT_FALSE(GetController()->Process(shift_alt_press));
- EXPECT_FALSE(GetController()->Process(shift_alt_press_post));
EXPECT_FALSE(GetController()->Process(shift_alt)); // crbug.com/123720
EXPECT_EQ(1, delegate->handle_next_ime_count());
EXPECT_FALSE(GetController()->Process(alt_shift_press));
- EXPECT_FALSE(GetController()->Process(alt_shift_press_post));
EXPECT_FALSE(GetController()->Process(alt_shift)); // crbug.com/123720
EXPECT_EQ(2, delegate->handle_next_ime_count());
// We should NOT switch IME when e.g. Shift+Alt+X is pressed and X is
// released.
- const PreImeAccelerator shift_alt_x_press(ui::VKEY_X, true, false, true);
- const PostImeAccelerator shift_alt_x_press_post(
- ui::VKEY_X, true, false, true);
- const PreImeReleaseAccelerator shift_alt_x(ui::VKEY_X, true, false, true);
- const PostImeReleaseAccelerator shift_alt_x_post(
- ui::VKEY_X, true, false, true);
+ const ui::Accelerator shift_alt_x_press(ui::VKEY_X, true, false, true);
+ const ReleaseAccelerator shift_alt_x(ui::VKEY_X, true, false, true);
EXPECT_FALSE(GetController()->Process(shift_alt_press));
- EXPECT_FALSE(GetController()->Process(shift_alt_press_post));
EXPECT_FALSE(GetController()->Process(shift_alt_x_press));
- EXPECT_FALSE(GetController()->Process(shift_alt_x_press_post));
EXPECT_FALSE(GetController()->Process(shift_alt_x));
- EXPECT_FALSE(GetController()->Process(shift_alt_x_post));
EXPECT_FALSE(GetController()->Process(shift_alt));
EXPECT_EQ(2, delegate->handle_next_ime_count());
}
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698