Chromium Code Reviews| 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 <set> | 5 #include <set> |
| 6 | 6 |
| 7 #include "ash/common/accelerators/accelerator_table.h" | 7 #include "ash/common/accelerators/accelerator_table.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 10 |
| 11 namespace ash { | 11 namespace ash { |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 struct Cmp { | 15 struct Cmp { |
| 16 bool operator()(const AcceleratorData& lhs, const AcceleratorData& rhs) { | 16 bool operator()(const AcceleratorData& lhs, const AcceleratorData& rhs) { |
| 17 if (lhs.trigger_on_press != rhs.trigger_on_press) | 17 if (lhs.trigger_on_press != rhs.trigger_on_press) |
| 18 return lhs.trigger_on_press < rhs.trigger_on_press; | 18 return lhs.trigger_on_press < rhs.trigger_on_press; |
| 19 if (lhs.keycode != rhs.keycode) | 19 if (lhs.keycode != rhs.keycode) |
| 20 return lhs.keycode < rhs.keycode; | 20 return lhs.keycode < rhs.keycode; |
| 21 return lhs.modifiers < rhs.modifiers; | 21 return lhs.modifiers < rhs.modifiers; |
| 22 // Do not check |action|. | 22 // Do not check |action|. |
| 23 } | 23 } |
| 24 }; | 24 }; |
| 25 | 25 |
| 26 const int kDebugModifier = | |
| 27 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN; | |
| 28 | |
| 29 const AcceleratorData kAcceleratorDataAchived20170405[] = { | |
|
afakhry
2017/04/05 16:01:32
We can keep this snapshot of only the non-Search-b
afakhry
2017/04/05 16:01:32
Please add a comment explaining what this snapshot
wutao
2017/04/05 16:49:32
Done.
wutao
2017/04/05 16:49:32
Done.
| |
| 30 {true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME}, | |
| 31 {false, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, PREVIOUS_IME}, | |
| 32 // Shortcuts for Japanese IME. | |
|
afakhry
2017/04/05 16:01:32
You don't need to include these comments here. Ple
wutao
2017/04/05 16:49:32
Done.
| |
| 33 {true, ui::VKEY_CONVERT, ui::EF_NONE, SWITCH_IME}, | |
| 34 {true, ui::VKEY_NONCONVERT, ui::EF_NONE, SWITCH_IME}, | |
| 35 {true, ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, SWITCH_IME}, | |
| 36 {true, ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, SWITCH_IME}, | |
| 37 // Shortcut for Koren IME. | |
| 38 {true, ui::VKEY_HANGUL, ui::EF_NONE, SWITCH_IME}, | |
| 39 | |
| 40 {true, ui::VKEY_TAB, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU}, | |
| 41 {true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | |
| 42 CYCLE_BACKWARD_MRU}, | |
| 43 {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE, TOGGLE_OVERVIEW}, | |
| 44 {true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST}, | |
| 45 {true, ui::VKEY_WLAN, ui::EF_NONE, TOGGLE_WIFI}, | |
| 46 {true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE, KEYBOARD_BRIGHTNESS_DOWN}, | |
| 47 {true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE, KEYBOARD_BRIGHTNESS_UP}, | |
| 48 // Maximize button. | |
| 49 {true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_CONTROL_DOWN, TOGGLE_MIRROR_MODE}, | |
| 50 {true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_ALT_DOWN, SWAP_PRIMARY_DISPLAY}, | |
| 51 // Cycle windows button. | |
| 52 {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN, TAKE_SCREENSHOT}, | |
| 53 {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | |
| 54 TAKE_PARTIAL_SCREENSHOT}, | |
| 55 {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_ALT_DOWN | ui::EF_CONTROL_DOWN, | |
| 56 TAKE_WINDOW_SCREENSHOT}, | |
| 57 {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE, BRIGHTNESS_DOWN}, | |
| 58 {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_DOWN}, | |
| 59 {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE, BRIGHTNESS_UP}, | |
| 60 {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_ALT_DOWN, KEYBOARD_BRIGHTNESS_UP}, | |
| 61 {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | |
| 62 MAGNIFY_SCREEN_ZOOM_OUT}, | |
| 63 {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | |
| 64 MAGNIFY_SCREEN_ZOOM_IN}, | |
| 65 {true, ui::VKEY_L, ui::EF_COMMAND_DOWN, LOCK_SCREEN}, | |
| 66 {true, ui::VKEY_L, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, SUSPEND}, | |
| 67 // The lock key on Chrome OS keyboards produces F13 scancodes. | |
| 68 {true, ui::VKEY_F13, ui::EF_NONE, LOCK_PRESSED}, | |
| 69 {false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED}, | |
| 70 // Generic keyboards can use VKEY_SLEEP to mimic ChromeOS keyboard's lock | |
| 71 // key. | |
| 72 {true, ui::VKEY_SLEEP, ui::EF_NONE, LOCK_PRESSED}, | |
| 73 {false, ui::VKEY_SLEEP, ui::EF_NONE, LOCK_RELEASED}, | |
| 74 {true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED}, | |
| 75 {false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED}, | |
| 76 {true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FILE_MANAGER}, | |
| 77 {true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, OPEN_GET_HELP}, | |
| 78 {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | |
| 79 OPEN_GET_HELP}, | |
| 80 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH}, | |
| 81 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | |
| 82 TOUCH_HUD_MODE_CHANGE}, | |
| 83 {true, ui::VKEY_I, | |
| 84 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, | |
| 85 TOUCH_HUD_CLEAR}, | |
| 86 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | |
| 87 TOUCH_HUD_PROJECTION_TOGGLE}, | |
| 88 {true, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | |
| 89 TOGGLE_HIGH_CONTRAST}, | |
| 90 {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | |
| 91 TOGGLE_SPOKEN_FEEDBACK}, | |
| 92 {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | |
| 93 SWITCH_TO_PREVIOUS_USER}, | |
| 94 {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | |
| 95 SWITCH_TO_NEXT_USER}, | |
| 96 // Single shift release turns off caps lock. | |
| 97 {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, | |
| 98 {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, | |
| 99 {false, ui::VKEY_RSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, | |
| 100 // Accelerators to toggle Caps Lock. | |
| 101 // The following is triggered when Search is released while Alt is still | |
| 102 // down. The key_code here is LWIN (for search) and Alt is a modifier. | |
| 103 {false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, TOGGLE_CAPS_LOCK}, | |
| 104 // The following is triggered when Alt is released while search is still | |
| 105 // down. The key_code here is MENU (for Alt) and Search is a modifier | |
| 106 // (EF_COMMAND_DOWN is used for Search as a modifier). | |
| 107 {false, ui::VKEY_MENU, ui::EF_COMMAND_DOWN, TOGGLE_CAPS_LOCK}, | |
| 108 {true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE}, | |
| 109 {true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN}, | |
| 110 {true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP}, | |
| 111 {true, ui::VKEY_ESCAPE, ui::EF_COMMAND_DOWN, SHOW_TASK_MANAGER}, | |
| 112 {true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, NEXT_IME}, | |
| 113 {true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE}, | |
| 114 {true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT}, | |
| 115 {true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | |
| 116 NEW_INCOGNITO_WINDOW}, | |
| 117 {true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW}, | |
| 118 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB}, | |
| 119 {true, ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, | |
| 120 SCALE_UI_UP}, | |
| 121 {true, ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, | |
| 122 SCALE_UI_DOWN}, | |
| 123 {true, ui::VKEY_0, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, SCALE_UI_RESET}, | |
| 124 {true, ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, | |
| 125 ROTATE_SCREEN}, | |
| 126 {true, ui::VKEY_BROWSER_REFRESH, | |
| 127 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_WINDOW}, | |
| 128 {true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, RESTORE_TAB}, | |
| 129 {true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT}, | |
| 130 // On Chrome OS, Search key is mapped to LWIN. The Search key binding should | |
| 131 // act on release instead of press when using Search as a modifier key for | |
| 132 // extended keyboard shortcuts. | |
| 133 {false, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST}, | |
| 134 {true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE, TOGGLE_FULLSCREEN}, | |
| 135 {true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_SHIFT_DOWN, TOGGLE_FULLSCREEN}, | |
| 136 {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN, UNPIN}, | |
| 137 {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF}, | |
| 138 {true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY}, | |
| 139 {true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | |
| 140 SHOW_KEYBOARD_OVERLAY}, | |
| 141 {true, ui::VKEY_OEM_2, | |
| 142 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | |
| 143 SHOW_KEYBOARD_OVERLAY}, | |
| 144 {true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY}, | |
| 145 {true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | |
| 146 SHOW_MESSAGE_CENTER_BUBBLE}, | |
| 147 {true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, SHOW_STYLUS_TOOLS}, | |
| 148 {true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | |
| 149 SHOW_SYSTEM_TRAY_BUBBLE}, | |
| 150 {true, ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN, | |
| 151 SHOW_IME_MENU_BUBBLE}, | |
| 152 {true, ui::VKEY_1, ui::EF_ALT_DOWN, LAUNCH_APP_0}, | |
| 153 {true, ui::VKEY_2, ui::EF_ALT_DOWN, LAUNCH_APP_1}, | |
| 154 {true, ui::VKEY_3, ui::EF_ALT_DOWN, LAUNCH_APP_2}, | |
| 155 {true, ui::VKEY_4, ui::EF_ALT_DOWN, LAUNCH_APP_3}, | |
| 156 {true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4}, | |
| 157 {true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5}, | |
| 158 {true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6}, | |
| 159 {true, ui::VKEY_8, ui::EF_ALT_DOWN, LAUNCH_APP_7}, | |
| 160 {true, ui::VKEY_9, ui::EF_ALT_DOWN, LAUNCH_LAST_APP}, | |
| 161 | |
| 162 // Window management shortcuts. | |
| 163 {true, ui::VKEY_OEM_4, ui::EF_ALT_DOWN, WINDOW_CYCLE_SNAP_LEFT}, | |
| 164 {true, ui::VKEY_OEM_6, ui::EF_ALT_DOWN, WINDOW_CYCLE_SNAP_RIGHT}, | |
| 165 {true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN, WINDOW_MINIMIZE}, | |
| 166 {true, ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN, TOGGLE_MAXIMIZED}, | |
| 167 {true, ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | |
| 168 WINDOW_POSITION_CENTER}, | |
| 169 {true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN, FOCUS_NEXT_PANE}, | |
| 170 {true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN, FOCUS_PREVIOUS_PANE}, | |
| 171 | |
| 172 // Media Player shortcuts. | |
| 173 {true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE, MEDIA_NEXT_TRACK}, | |
| 174 {true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE, MEDIA_PLAY_PAUSE}, | |
| 175 {true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE, MEDIA_PREV_TRACK}, | |
| 176 | |
| 177 // Debugging shortcuts that need to be available to end-users in | |
| 178 // release builds. | |
| 179 {true, ui::VKEY_U, kDebugModifier, PRINT_UI_HIERARCHIES}, | |
| 180 | |
| 181 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and | |
| 182 // VKEY_MEDIA_LAUNCH_MAIL. | |
| 183 }; | |
| 184 | |
| 185 const size_t kAchivedAcceleratorDataLength = | |
| 186 arraysize(kAcceleratorDataAchived20170405); | |
| 187 | |
| 26 } // namespace | 188 } // namespace |
| 27 | 189 |
| 28 TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) { | 190 TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) { |
| 29 std::set<AcceleratorData, Cmp> accelerators; | 191 std::set<AcceleratorData, Cmp> accelerators; |
| 30 for (size_t i = 0; i < kAcceleratorDataLength; ++i) { | 192 for (size_t i = 0; i < kAcceleratorDataLength; ++i) { |
| 31 const AcceleratorData& entry = kAcceleratorData[i]; | 193 const AcceleratorData& entry = kAcceleratorData[i]; |
| 32 EXPECT_TRUE(accelerators.insert(entry).second) | 194 EXPECT_TRUE(accelerators.insert(entry).second) |
| 33 << "Duplicated accelerator: " << entry.trigger_on_press << ", " | 195 << "Duplicated accelerator: " << entry.trigger_on_press << ", " |
| 34 << entry.keycode << ", " << (entry.modifiers & ui::EF_SHIFT_DOWN) | 196 << entry.keycode << ", " << (entry.modifiers & ui::EF_SHIFT_DOWN) |
| 35 << ", " << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " | 197 << ", " << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 EXPECT_TRUE(actions.insert(data.action).second) << "Deprecated action: " | 256 EXPECT_TRUE(actions.insert(data.action).second) << "Deprecated action: " |
| 95 << data.action; | 257 << data.action; |
| 96 | 258 |
| 97 // The UMA histogram name must be of the format "Ash.Accelerators.*" | 259 // The UMA histogram name must be of the format "Ash.Accelerators.*" |
| 98 std::string uma_histogram(data.uma_histogram_name); | 260 std::string uma_histogram(data.uma_histogram_name); |
| 99 EXPECT_TRUE(base::StartsWith(uma_histogram, "Ash.Accelerators.", | 261 EXPECT_TRUE(base::StartsWith(uma_histogram, "Ash.Accelerators.", |
| 100 base::CompareCase::SENSITIVE)); | 262 base::CompareCase::SENSITIVE)); |
| 101 } | 263 } |
| 102 } | 264 } |
| 103 | 265 |
| 266 TEST(AcceleratorTableTest, CheckSearchKeyBasedAccelerators) { | |
| 267 std::set<AcceleratorData, Cmp> achived_accelerators; | |
| 268 for (size_t i = 0; i < kAchivedAcceleratorDataLength; ++i) | |
| 269 achived_accelerators.insert(kAcceleratorDataAchived20170405[i]); | |
| 270 | |
| 271 for (size_t i = 0; i < kAcceleratorDataLength; ++i) { | |
| 272 const AcceleratorData& entry = kAcceleratorData[i]; | |
| 273 if (achived_accelerators.find(entry) != achived_accelerators.end()) | |
| 274 continue; | |
| 275 EXPECT_TRUE(entry.modifiers & ui::EF_COMMAND_DOWN) | |
| 276 << "Non-command key based accelerator: " << entry.trigger_on_press | |
|
afakhry
2017/04/05 16:01:32
Use Search instead of command.
Search-based accele
wutao
2017/04/05 16:49:32
Done.
| |
| 277 << ", " << entry.keycode << ", " | |
| 278 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " | |
| 279 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " | |
| 280 << (entry.modifiers & ui::EF_ALT_DOWN); | |
| 281 } | |
| 282 } | |
| 283 | |
| 104 } // namespace ash | 284 } // namespace ash |
| OLD | NEW |