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

Side by Side Diff: ash/accelerators/accelerator_table.cc

Issue 1412623006: Developer Feature: Add Debug Accelerators to Toggle Touchscreen/Touchpad On or Off (CrOS) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix actions.xml. Created 5 years, 2 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 unified diff | Download patch
OLDNEW
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 "ash/strings/grit/ash_strings.h" 7 #include "ash/strings/grit/ash_strings.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 // Extra shortcuts to lock the screen on linux desktop. 231 // Extra shortcuts to lock the screen on linux desktop.
232 {true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN}, 232 {true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN},
233 {true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED}, 233 {true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED},
234 {false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED}, 234 {false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED},
235 {true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, 235 {true, ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
236 DEBUG_ADD_REMOVE_DISPLAY}, 236 DEBUG_ADD_REMOVE_DISPLAY},
237 {true, ui::VKEY_J, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, 237 {true, ui::VKEY_J, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
238 DEBUG_TOGGLE_UNIFIED_DESKTOP}, 238 DEBUG_TOGGLE_UNIFIED_DESKTOP},
239 {true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, 239 {true, ui::VKEY_M, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
240 TOGGLE_MIRROR_MODE}, 240 TOGGLE_MIRROR_MODE},
241 {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
242 TOGGLE_TOUCH_PAD},
243 {true, ui::VKEY_T, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
244 TOGGLE_TOUCH_SCREEN},
241 {true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI}, 245 {true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI},
242 // Extra shortcut for display swapping as alt-f4 is taken on linux desktop. 246 // Extra shortcut for display swapping as alt-f4 is taken on linux desktop.
243 {true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, 247 {true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
244 SWAP_PRIMARY_DISPLAY}, 248 SWAP_PRIMARY_DISPLAY},
245 #endif 249 #endif
246 // Extra shortcut to rotate/scale up/down the screen on linux desktop. 250 // Extra shortcut to rotate/scale up/down the screen on linux desktop.
247 {true, ui::VKEY_R, 251 {true, ui::VKEY_R,
248 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN}, 252 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN},
249 // For testing on systems where Alt-Tab is already mapped. 253 // For testing on systems where Alt-Tab is already mapped.
250 {true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU}, 254 {true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU},
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 #if defined(OS_CHROMEOS) 323 #if defined(OS_CHROMEOS)
320 BRIGHTNESS_DOWN, 324 BRIGHTNESS_DOWN,
321 BRIGHTNESS_UP, 325 BRIGHTNESS_UP,
322 DEBUG_ADD_REMOVE_DISPLAY, 326 DEBUG_ADD_REMOVE_DISPLAY,
323 DISABLE_CAPS_LOCK, 327 DISABLE_CAPS_LOCK,
324 DISABLE_GPU_WATCHDOG, 328 DISABLE_GPU_WATCHDOG,
325 KEYBOARD_BRIGHTNESS_DOWN, 329 KEYBOARD_BRIGHTNESS_DOWN,
326 KEYBOARD_BRIGHTNESS_UP, 330 KEYBOARD_BRIGHTNESS_UP,
327 TOGGLE_CAPS_LOCK, 331 TOGGLE_CAPS_LOCK,
328 TOGGLE_SPOKEN_FEEDBACK, 332 TOGGLE_SPOKEN_FEEDBACK,
333 TOGGLE_TOUCH_PAD,
334 TOGGLE_TOUCH_SCREEN,
329 TOGGLE_TOUCH_VIEW_TESTING, 335 TOGGLE_TOUCH_VIEW_TESTING,
330 TOGGLE_MIRROR_MODE, 336 TOGGLE_MIRROR_MODE,
331 TOGGLE_WIFI, 337 TOGGLE_WIFI,
332 TOUCH_HUD_CLEAR, 338 TOUCH_HUD_CLEAR,
333 VOLUME_DOWN, 339 VOLUME_DOWN,
334 VOLUME_MUTE, 340 VOLUME_MUTE,
335 VOLUME_UP, 341 VOLUME_UP,
336 #endif 342 #endif
337 #if defined(OS_CHROMEOS) && !defined(NDEBUG) 343 #if defined(OS_CHROMEOS) && !defined(NDEBUG)
338 POWER_PRESSED, 344 POWER_PRESSED,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 DISABLE_CAPS_LOCK, 382 DISABLE_CAPS_LOCK,
377 KEYBOARD_BRIGHTNESS_DOWN, 383 KEYBOARD_BRIGHTNESS_DOWN,
378 KEYBOARD_BRIGHTNESS_UP, 384 KEYBOARD_BRIGHTNESS_UP,
379 LOCK_SCREEN, 385 LOCK_SCREEN,
380 POWER_PRESSED, 386 POWER_PRESSED,
381 POWER_RELEASED, 387 POWER_RELEASED,
382 SWAP_PRIMARY_DISPLAY, 388 SWAP_PRIMARY_DISPLAY,
383 TOGGLE_CAPS_LOCK, 389 TOGGLE_CAPS_LOCK,
384 TOGGLE_MIRROR_MODE, 390 TOGGLE_MIRROR_MODE,
385 TOGGLE_SPOKEN_FEEDBACK, 391 TOGGLE_SPOKEN_FEEDBACK,
392 TOGGLE_TOUCH_PAD,
393 TOGGLE_TOUCH_SCREEN,
386 TOGGLE_WIFI, 394 TOGGLE_WIFI,
387 VOLUME_DOWN, 395 VOLUME_DOWN,
388 VOLUME_MUTE, 396 VOLUME_MUTE,
389 VOLUME_UP, 397 VOLUME_UP,
390 #endif 398 #endif
391 }; 399 };
392 400
393 const size_t kActionsAllowedAtModalWindowLength = 401 const size_t kActionsAllowedAtModalWindowLength =
394 arraysize(kActionsAllowedAtModalWindow); 402 arraysize(kActionsAllowedAtModalWindow);
395 403
396 const AcceleratorAction kNonrepeatableActions[] = { 404 const AcceleratorAction kNonrepeatableActions[] = {
397 // TODO(mazda): Add other actions which should not be repeated. 405 // TODO(mazda): Add other actions which should not be repeated.
398 CYCLE_BACKWARD_MRU, 406 CYCLE_BACKWARD_MRU,
399 CYCLE_FORWARD_MRU, 407 CYCLE_FORWARD_MRU,
400 TOGGLE_OVERVIEW, 408 TOGGLE_OVERVIEW,
401 EXIT, 409 EXIT,
402 PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down. 410 PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down.
403 ROTATE_SCREEN, 411 ROTATE_SCREEN,
404 ROTATE_WINDOW, 412 ROTATE_WINDOW,
405 SCALE_UI_UP, 413 SCALE_UI_UP,
406 SCALE_UI_DOWN, 414 SCALE_UI_DOWN,
407 SCALE_UI_RESET, 415 SCALE_UI_RESET,
408 TAKE_PARTIAL_SCREENSHOT, 416 TAKE_PARTIAL_SCREENSHOT,
409 TAKE_SCREENSHOT, 417 TAKE_SCREENSHOT,
410 TOGGLE_FULLSCREEN, 418 TOGGLE_FULLSCREEN,
411 TOGGLE_MAXIMIZED, 419 TOGGLE_MAXIMIZED,
412 WINDOW_MINIMIZE, 420 WINDOW_MINIMIZE,
413 #if defined(OS_CHROMEOS) 421 #if defined(OS_CHROMEOS)
414 LOCK_SCREEN, 422 LOCK_SCREEN,
423 TOGGLE_TOUCH_PAD,
424 TOGGLE_TOUCH_SCREEN,
415 #endif 425 #endif
416 }; 426 };
417 427
418 const size_t kNonrepeatableActionsLength = 428 const size_t kNonrepeatableActionsLength =
419 arraysize(kNonrepeatableActions); 429 arraysize(kNonrepeatableActions);
420 430
421 const AcceleratorAction kActionsAllowedInAppMode[] = { 431 const AcceleratorAction kActionsAllowedInAppMode[] = {
422 DEBUG_PRINT_LAYER_HIERARCHY, 432 DEBUG_PRINT_LAYER_HIERARCHY,
423 DEBUG_PRINT_VIEW_HIERARCHY, 433 DEBUG_PRINT_VIEW_HIERARCHY,
424 DEBUG_PRINT_WINDOW_HIERARCHY, 434 DEBUG_PRINT_WINDOW_HIERARCHY,
(...skipping 17 matching lines...) Expand all
442 DISABLE_CAPS_LOCK, 452 DISABLE_CAPS_LOCK,
443 DISABLE_GPU_WATCHDOG, 453 DISABLE_GPU_WATCHDOG,
444 KEYBOARD_BRIGHTNESS_DOWN, 454 KEYBOARD_BRIGHTNESS_DOWN,
445 KEYBOARD_BRIGHTNESS_UP, 455 KEYBOARD_BRIGHTNESS_UP,
446 POWER_PRESSED, 456 POWER_PRESSED,
447 POWER_RELEASED, 457 POWER_RELEASED,
448 SWAP_PRIMARY_DISPLAY, 458 SWAP_PRIMARY_DISPLAY,
449 TOGGLE_CAPS_LOCK, 459 TOGGLE_CAPS_LOCK,
450 TOGGLE_MIRROR_MODE, 460 TOGGLE_MIRROR_MODE,
451 TOGGLE_SPOKEN_FEEDBACK, 461 TOGGLE_SPOKEN_FEEDBACK,
462 TOGGLE_TOUCH_PAD,
463 TOGGLE_TOUCH_SCREEN,
452 TOGGLE_WIFI, 464 TOGGLE_WIFI,
453 TOUCH_HUD_CLEAR, 465 TOUCH_HUD_CLEAR,
454 VOLUME_DOWN, 466 VOLUME_DOWN,
455 VOLUME_MUTE, 467 VOLUME_MUTE,
456 VOLUME_UP, 468 VOLUME_UP,
457 #endif // defined(OS_CHROMEOS) 469 #endif // defined(OS_CHROMEOS)
458 }; 470 };
459 471
460 const size_t kActionsAllowedInAppModeLength = 472 const size_t kActionsAllowedInAppModeLength =
461 arraysize(kActionsAllowedInAppMode); 473 arraysize(kActionsAllowedInAppMode);
(...skipping 25 matching lines...) Expand all
487 TAKE_SCREENSHOT, 499 TAKE_SCREENSHOT,
488 #if defined(OS_CHROMEOS) 500 #if defined(OS_CHROMEOS)
489 BRIGHTNESS_DOWN, 501 BRIGHTNESS_DOWN,
490 BRIGHTNESS_UP, 502 BRIGHTNESS_UP,
491 DISABLE_CAPS_LOCK, 503 DISABLE_CAPS_LOCK,
492 KEYBOARD_BRIGHTNESS_DOWN, 504 KEYBOARD_BRIGHTNESS_DOWN,
493 KEYBOARD_BRIGHTNESS_UP, 505 KEYBOARD_BRIGHTNESS_UP,
494 SILENCE_SPOKEN_FEEDBACK, 506 SILENCE_SPOKEN_FEEDBACK,
495 TOGGLE_CAPS_LOCK, 507 TOGGLE_CAPS_LOCK,
496 TOGGLE_SPOKEN_FEEDBACK, 508 TOGGLE_SPOKEN_FEEDBACK,
509 TOGGLE_TOUCH_PAD,
510 TOGGLE_TOUCH_SCREEN,
497 TOGGLE_WIFI, 511 TOGGLE_WIFI,
498 VOLUME_DOWN, 512 VOLUME_DOWN,
499 VOLUME_MUTE, 513 VOLUME_MUTE,
500 VOLUME_UP, 514 VOLUME_UP,
501 #endif // defined(OS_CHROMEOS) 515 #endif // defined(OS_CHROMEOS)
502 }; 516 };
503 517
504 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); 518 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
505 519
506 } // namespace ash 520 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698