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_table.h" | 5 #include "ash/accelerators/accelerator_table.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 | 8 |
9 namespace ash { | 9 namespace ash { |
10 | 10 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 57 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
58 MAGNIFY_SCREEN_ZOOM_OUT}, | 58 MAGNIFY_SCREEN_ZOOM_OUT}, |
59 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 59 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
60 MAGNIFY_SCREEN_ZOOM_IN}, | 60 MAGNIFY_SCREEN_ZOOM_IN}, |
61 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, | 61 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN }, |
62 // The lock key on Chrome OS keyboards produces F13 scancodes. | 62 // The lock key on Chrome OS keyboards produces F13 scancodes. |
63 { true, ui::VKEY_F13, ui::EF_NONE, LOCK_PRESSED }, | 63 { true, ui::VKEY_F13, ui::EF_NONE, LOCK_PRESSED }, |
64 { false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED }, | 64 { false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED }, |
65 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, | 65 { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED }, |
66 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, | 66 { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED }, |
67 #if !defined(NDEBUG) | |
68 // Extra shortcut for debug build to control magnifier on linux desktop. | |
69 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN, | |
70 MAGNIFY_SCREEN_ZOOM_OUT}, | |
71 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, | |
72 // Extra shortcut for debug build to activate lock screen on linux desktop. | |
73 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, | |
74 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. | |
75 { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, | |
76 SWAP_PRIMARY_DISPLAY }, | |
77 // Extra shortcut to lock the screen on linux desktop. | |
78 { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED }, | |
79 { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED }, | |
80 // Extra shortcut to rotate/scale up/down the screen on linux desktop. | |
81 { true, ui::VKEY_R, | |
82 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN }, | |
83 #endif // !defined(NDEBUG) | |
84 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG }, | 67 { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG }, |
85 { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 68 { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
86 OPEN_FILE_MANAGER }, | 69 OPEN_FILE_MANAGER }, |
87 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, | 70 { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH }, |
88 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 71 { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
89 DISABLE_GPU_WATCHDOG }, | 72 DISABLE_GPU_WATCHDOG }, |
90 #endif // defined(OS_CHROMEOS) | 73 #endif // defined(OS_CHROMEOS) |
91 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, | 74 { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, |
92 #if !defined(OS_WIN) | 75 #if !defined(OS_WIN) |
93 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, | 76 { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 // release builds. | 157 // release builds. |
175 { true, ui::VKEY_U, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, | 158 { true, ui::VKEY_U, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, |
176 PRINT_UI_HIERARCHIES }, | 159 PRINT_UI_HIERARCHIES }, |
177 | 160 |
178 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and | 161 // TODO(yusukes): Handle VKEY_MEDIA_STOP, and |
179 // VKEY_MEDIA_LAUNCH_MAIL. | 162 // VKEY_MEDIA_LAUNCH_MAIL. |
180 }; | 163 }; |
181 | 164 |
182 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); | 165 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData); |
183 | 166 |
184 const AcceleratorData kDebugAcceleratorData[] = { | 167 #if !defined(NDEBUG) |
| 168 const AcceleratorData kDesktopAcceleratorData[] = { |
| 169 // Extra shortcut for debug build to control magnifier on linux desktop. |
| 170 { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN, |
| 171 MAGNIFY_SCREEN_ZOOM_OUT}, |
| 172 { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN}, |
| 173 // Extra shortcut for debug build to activate lock screen on linux desktop. |
| 174 { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN }, |
| 175 // Extra shortcut for display swaping as alt-f4 is taken on linux desktop. |
| 176 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 177 SWAP_PRIMARY_DISPLAY }, |
| 178 // Extra shortcut to lock the screen on linux desktop. |
| 179 { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED }, |
| 180 { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED }, |
| 181 // Extra shortcut to rotate/scale up/down the screen on linux desktop. |
| 182 { true, ui::VKEY_R, |
| 183 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN }, |
| 184 // For testing on systems where Alt-Tab is already mapped. |
| 185 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, |
| 186 |
| 187 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, |
| 188 { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI }, |
| 189 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 190 CYCLE_BACKWARD_MRU }, |
185 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 191 { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
186 TOGGLE_DESKTOP_BACKGROUND_MODE }, | 192 TOGGLE_DESKTOP_BACKGROUND_MODE }, |
187 { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN }, | 193 }; |
188 { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI }, | 194 |
189 // For testing on systems where Alt-Tab is already mapped. | 195 const size_t kDesktopAcceleratorDataLength = arraysize(kDesktopAcceleratorData); |
190 { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU }, | 196 #endif |
191 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 197 |
192 CYCLE_BACKWARD_MRU }, | 198 const AcceleratorData kDebugAcceleratorData[] = { |
193 { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | |
194 DISPLAY_TOGGLE_SCALE }, | |
195 #if !defined(NDEBUG) | |
196 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 199 { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
197 PRINT_LAYER_HIERARCHY }, | 200 PRINT_LAYER_HIERARCHY }, |
198 { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 201 { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
199 PRINT_VIEW_HIERARCHY }, | 202 PRINT_VIEW_HIERARCHY }, |
200 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 203 { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
201 PRINT_WINDOW_HIERARCHY }, | 204 PRINT_WINDOW_HIERARCHY }, |
202 #endif | 205 { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 206 DEBUG_TOGGLE_DEVICE_SCALE_FACTOR }, |
| 207 { true, ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 208 DEBUG_TOGGLE_SHOW_DEBUG_BORDERS }, |
| 209 { true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 210 DEBUG_TOGGLE_SHOW_FPS_COUNTER }, |
| 211 { true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 212 DEBUG_TOGGLE_SHOW_PAINT_RECTS }, |
203 }; | 213 }; |
204 | 214 |
205 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData); | 215 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData); |
206 | 216 |
207 const AcceleratorAction kReservedActions[] = { | 217 const AcceleratorAction kReservedActions[] = { |
208 // Window cycling accelerators. | 218 // Window cycling accelerators. |
209 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab | 219 CYCLE_BACKWARD_MRU, // Shift+Alt+Tab |
210 CYCLE_FORWARD_MRU, // Alt+Tab | 220 CYCLE_FORWARD_MRU, // Alt+Tab |
211 #if defined(OS_CHROMEOS) | 221 #if defined(OS_CHROMEOS) |
212 POWER_PRESSED, | 222 POWER_PRESSED, |
213 POWER_RELEASED, | 223 POWER_RELEASED, |
214 #endif | 224 #endif |
215 }; | 225 }; |
216 | 226 |
217 const size_t kReservedActionsLength = arraysize(kReservedActions); | 227 const size_t kReservedActionsLength = arraysize(kReservedActions); |
218 | 228 |
219 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = { | 229 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = { |
220 BRIGHTNESS_DOWN, | 230 BRIGHTNESS_DOWN, |
221 BRIGHTNESS_UP, | 231 BRIGHTNESS_UP, |
222 #if defined(OS_CHROMEOS) | |
223 CYCLE_DISPLAY_MODE, | |
224 DISABLE_GPU_WATCHDOG, | |
225 #endif // defined(OS_CHROMEOS) | |
226 DISABLE_CAPS_LOCK, | 232 DISABLE_CAPS_LOCK, |
227 KEYBOARD_BRIGHTNESS_DOWN, | 233 KEYBOARD_BRIGHTNESS_DOWN, |
228 KEYBOARD_BRIGHTNESS_UP, | 234 KEYBOARD_BRIGHTNESS_UP, |
229 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 | 235 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 |
230 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 | 236 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 |
231 NEXT_IME, | 237 NEXT_IME, |
232 PREVIOUS_IME, | 238 PREVIOUS_IME, |
| 239 PRINT_LAYER_HIERARCHY, |
233 PRINT_UI_HIERARCHIES, | 240 PRINT_UI_HIERARCHIES, |
| 241 PRINT_VIEW_HIERARCHY, |
| 242 PRINT_WINDOW_HIERARCHY, |
| 243 ROTATE_WINDOW, |
234 SWITCH_IME, // Switch to another IME depending on the accelerator. | 244 SWITCH_IME, // Switch to another IME depending on the accelerator. |
| 245 TAKE_PARTIAL_SCREENSHOT, |
235 TAKE_SCREENSHOT, | 246 TAKE_SCREENSHOT, |
236 TAKE_PARTIAL_SCREENSHOT, | |
237 TOGGLE_CAPS_LOCK, | 247 TOGGLE_CAPS_LOCK, |
238 TOGGLE_SPOKEN_FEEDBACK, | 248 TOGGLE_SPOKEN_FEEDBACK, |
239 TOGGLE_WIFI, | 249 TOGGLE_WIFI, |
240 TOUCH_HUD_CLEAR, | 250 TOUCH_HUD_CLEAR, |
241 VOLUME_DOWN, | 251 VOLUME_DOWN, |
242 VOLUME_MUTE, | 252 VOLUME_MUTE, |
243 VOLUME_UP, | 253 VOLUME_UP, |
244 ROTATE_WINDOW, | 254 #if defined(OS_CHROMEOS) |
245 #if !defined(NDEBUG) | 255 CYCLE_DISPLAY_MODE, |
246 PRINT_LAYER_HIERARCHY, | 256 DISABLE_GPU_WATCHDOG, |
247 PRINT_VIEW_HIERARCHY, | |
248 PRINT_WINDOW_HIERARCHY, | |
249 #endif | 257 #endif |
250 #if defined(OS_CHROMEOS) && !defined(NDEBUG) | 258 #if defined(OS_CHROMEOS) && !defined(NDEBUG) |
251 POWER_PRESSED, | 259 POWER_PRESSED, |
252 POWER_RELEASED, | 260 POWER_RELEASED, |
253 #endif | 261 #endif // defined(OS_CHROMEOS) |
254 }; | 262 }; |
255 | 263 |
256 const size_t kActionsAllowedAtLoginOrLockScreenLength = | 264 const size_t kActionsAllowedAtLoginOrLockScreenLength = |
257 arraysize(kActionsAllowedAtLoginOrLockScreen); | 265 arraysize(kActionsAllowedAtLoginOrLockScreen); |
258 | 266 |
259 const AcceleratorAction kActionsAllowedAtLockScreen[] = { | 267 const AcceleratorAction kActionsAllowedAtLockScreen[] = { |
260 EXIT, | 268 EXIT, |
261 }; | 269 }; |
262 | 270 |
263 const size_t kActionsAllowedAtLockScreenLength = | 271 const size_t kActionsAllowedAtLockScreenLength = |
(...skipping 13 matching lines...) Expand all Loading... |
277 MEDIA_PREV_TRACK, | 285 MEDIA_PREV_TRACK, |
278 NEXT_IME, | 286 NEXT_IME, |
279 OPEN_FEEDBACK_PAGE, | 287 OPEN_FEEDBACK_PAGE, |
280 POWER_PRESSED, | 288 POWER_PRESSED, |
281 POWER_RELEASED, | 289 POWER_RELEASED, |
282 PREVIOUS_IME, | 290 PREVIOUS_IME, |
283 PRINT_UI_HIERARCHIES, | 291 PRINT_UI_HIERARCHIES, |
284 SHOW_KEYBOARD_OVERLAY, | 292 SHOW_KEYBOARD_OVERLAY, |
285 SWAP_PRIMARY_DISPLAY, | 293 SWAP_PRIMARY_DISPLAY, |
286 SWITCH_IME, | 294 SWITCH_IME, |
| 295 TAKE_PARTIAL_SCREENSHOT, |
287 TAKE_SCREENSHOT, | 296 TAKE_SCREENSHOT, |
288 TAKE_PARTIAL_SCREENSHOT, | |
289 TOGGLE_CAPS_LOCK, | 297 TOGGLE_CAPS_LOCK, |
290 TOGGLE_SPOKEN_FEEDBACK, | 298 TOGGLE_SPOKEN_FEEDBACK, |
291 TOGGLE_WIFI, | 299 TOGGLE_WIFI, |
292 VOLUME_DOWN, | 300 VOLUME_DOWN, |
293 VOLUME_MUTE, | 301 VOLUME_MUTE, |
294 VOLUME_UP, | 302 VOLUME_UP, |
295 #if defined(OS_CHROMEOS) | 303 #if defined(OS_CHROMEOS) |
296 CYCLE_DISPLAY_MODE, | 304 CYCLE_DISPLAY_MODE, |
297 LOCK_SCREEN, | 305 LOCK_SCREEN, |
298 #endif | 306 #endif |
299 }; | 307 }; |
300 | 308 |
301 const size_t kActionsAllowedAtModalWindowLength = | 309 const size_t kActionsAllowedAtModalWindowLength = |
302 arraysize(kActionsAllowedAtModalWindow); | 310 arraysize(kActionsAllowedAtModalWindow); |
303 | 311 |
304 const AcceleratorAction kNonrepeatableActions[] = { | 312 const AcceleratorAction kNonrepeatableActions[] = { |
305 // TODO(mazda): Add other actions which should not be repeated. | 313 // TODO(mazda): Add other actions which should not be repeated. |
306 CYCLE_BACKWARD_LINEAR, | 314 CYCLE_BACKWARD_LINEAR, |
307 CYCLE_BACKWARD_MRU, | 315 CYCLE_BACKWARD_MRU, |
308 CYCLE_FORWARD_LINEAR, | 316 CYCLE_FORWARD_LINEAR, |
309 CYCLE_FORWARD_MRU, | 317 CYCLE_FORWARD_MRU, |
310 PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down. | 318 PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down. |
311 ROTATE_SCREEN, | 319 ROTATE_SCREEN, |
312 ROTATE_WINDOW, | 320 ROTATE_WINDOW, |
313 SCALE_UI_UP, | |
314 SCALE_UI_DOWN, | 321 SCALE_UI_DOWN, |
315 SCALE_UI_RESET, | 322 SCALE_UI_RESET, |
| 323 SCALE_UI_UP, |
316 TOGGLE_MAXIMIZED, | 324 TOGGLE_MAXIMIZED, |
317 WINDOW_MINIMIZE, | 325 WINDOW_MINIMIZE, |
318 }; | 326 }; |
319 | 327 |
320 const size_t kNonrepeatableActionsLength = | 328 const size_t kNonrepeatableActionsLength = |
321 arraysize(kNonrepeatableActions); | 329 arraysize(kNonrepeatableActions); |
322 | 330 |
323 const AcceleratorAction kActionsAllowedInAppMode[] = { | 331 const AcceleratorAction kActionsAllowedInAppMode[] = { |
324 BRIGHTNESS_DOWN, | 332 BRIGHTNESS_DOWN, |
325 BRIGHTNESS_UP, | 333 BRIGHTNESS_UP, |
326 #if defined(OS_CHROMEOS) | |
327 CYCLE_DISPLAY_MODE, | |
328 DISABLE_GPU_WATCHDOG, | |
329 #endif // defined(OS_CHROMEOS) | |
330 DISABLE_CAPS_LOCK, | 334 DISABLE_CAPS_LOCK, |
331 KEYBOARD_BRIGHTNESS_DOWN, | 335 KEYBOARD_BRIGHTNESS_DOWN, |
332 KEYBOARD_BRIGHTNESS_UP, | 336 KEYBOARD_BRIGHTNESS_UP, |
333 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 | 337 MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 |
334 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 | 338 MAGNIFY_SCREEN_ZOOM_OUT, // Control+F6 |
335 MEDIA_NEXT_TRACK, | 339 MEDIA_NEXT_TRACK, |
336 MEDIA_PLAY_PAUSE, | 340 MEDIA_PLAY_PAUSE, |
337 MEDIA_PREV_TRACK, | 341 MEDIA_PREV_TRACK, |
338 NEXT_IME, | 342 NEXT_IME, |
339 POWER_PRESSED, | 343 POWER_PRESSED, |
340 POWER_RELEASED, | 344 POWER_RELEASED, |
341 PREVIOUS_IME, | 345 PREVIOUS_IME, |
| 346 PRINT_LAYER_HIERARCHY, |
342 PRINT_UI_HIERARCHIES, | 347 PRINT_UI_HIERARCHIES, |
| 348 PRINT_VIEW_HIERARCHY, |
| 349 PRINT_WINDOW_HIERARCHY, |
343 ROTATE_SCREEN, | 350 ROTATE_SCREEN, |
344 SCALE_UI_UP, | |
345 SCALE_UI_DOWN, | 351 SCALE_UI_DOWN, |
346 SCALE_UI_RESET, | 352 SCALE_UI_RESET, |
| 353 SCALE_UI_UP, |
347 SWAP_PRIMARY_DISPLAY, | 354 SWAP_PRIMARY_DISPLAY, |
348 SWITCH_IME, // Switch to another IME depending on the accelerator. | 355 SWITCH_IME, // Switch to another IME depending on the accelerator. |
349 TOGGLE_CAPS_LOCK, | 356 TOGGLE_CAPS_LOCK, |
350 TOGGLE_SPOKEN_FEEDBACK, | 357 TOGGLE_SPOKEN_FEEDBACK, |
351 TOGGLE_WIFI, | 358 TOGGLE_WIFI, |
352 TOUCH_HUD_CLEAR, | 359 TOUCH_HUD_CLEAR, |
353 VOLUME_DOWN, | 360 VOLUME_DOWN, |
354 VOLUME_MUTE, | 361 VOLUME_MUTE, |
355 VOLUME_UP, | 362 VOLUME_UP, |
356 #if !defined(NDEBUG) | 363 #if defined(OS_CHROMEOS) |
357 PRINT_LAYER_HIERARCHY, | 364 CYCLE_DISPLAY_MODE, |
358 PRINT_VIEW_HIERARCHY, | 365 DISABLE_GPU_WATCHDOG, |
359 PRINT_WINDOW_HIERARCHY, | 366 #endif // defined(OS_CHROMEOS) |
360 #endif | |
361 }; | 367 }; |
362 | 368 |
363 const size_t kActionsAllowedInAppModeLength = | 369 const size_t kActionsAllowedInAppModeLength = |
364 arraysize(kActionsAllowedInAppMode); | 370 arraysize(kActionsAllowedInAppMode); |
365 | 371 |
366 } // namespace ash | 372 } // namespace ash |
OLD | NEW |