| 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/common/accelerators/accelerator_table.h" | 5 #include "ash/common/accelerators/accelerator_table.h" |
| 6 | 6 |
| 7 #include "ash/common/strings/grit/ash_strings.h" | 7 #include "ash/common/strings/grit/ash_strings.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 65 {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 66 OPEN_GET_HELP}, | 66 OPEN_GET_HELP}, |
| 67 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH}, | 67 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH}, |
| 68 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 68 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 69 TOUCH_HUD_MODE_CHANGE}, | 69 TOUCH_HUD_MODE_CHANGE}, |
| 70 {true, ui::VKEY_I, | 70 {true, ui::VKEY_I, |
| 71 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, | 71 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, |
| 72 TOUCH_HUD_CLEAR}, | 72 TOUCH_HUD_CLEAR}, |
| 73 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 73 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 74 TOUCH_HUD_PROJECTION_TOGGLE}, | 74 TOUCH_HUD_PROJECTION_TOGGLE}, |
| 75 // Accessibility: Spoken feedback shortcuts. The first one is to toggle | 75 {false, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, |
| 76 // spoken feedback on or off. The others are only valid when | 76 TOGGLE_HIGH_CONTRAST}, |
| 77 // spoken feedback is enabled. | |
| 78 {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 77 {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 79 TOGGLE_SPOKEN_FEEDBACK}, | 78 TOGGLE_SPOKEN_FEEDBACK}, |
| 80 {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 79 {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 81 SWITCH_TO_PREVIOUS_USER}, | 80 SWITCH_TO_PREVIOUS_USER}, |
| 82 {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 81 {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 83 SWITCH_TO_NEXT_USER}, | 82 SWITCH_TO_NEXT_USER}, |
| 84 // Single shift release turns off caps lock. | 83 // Single shift release turns off caps lock. |
| 85 {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, | 84 {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, |
| 86 {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, | 85 {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, |
| 87 {false, ui::VKEY_RSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, | 86 {false, ui::VKEY_RSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 BRIGHTNESS_DOWN, | 332 BRIGHTNESS_DOWN, |
| 334 BRIGHTNESS_UP, | 333 BRIGHTNESS_UP, |
| 335 DEBUG_TOGGLE_TOUCH_PAD, | 334 DEBUG_TOGGLE_TOUCH_PAD, |
| 336 DEBUG_TOGGLE_TOUCH_SCREEN, | 335 DEBUG_TOGGLE_TOUCH_SCREEN, |
| 337 DEBUG_TOGGLE_TOUCH_VIEW, | 336 DEBUG_TOGGLE_TOUCH_VIEW, |
| 338 DEV_ADD_REMOVE_DISPLAY, | 337 DEV_ADD_REMOVE_DISPLAY, |
| 339 DISABLE_CAPS_LOCK, | 338 DISABLE_CAPS_LOCK, |
| 340 KEYBOARD_BRIGHTNESS_DOWN, | 339 KEYBOARD_BRIGHTNESS_DOWN, |
| 341 KEYBOARD_BRIGHTNESS_UP, | 340 KEYBOARD_BRIGHTNESS_UP, |
| 342 TOGGLE_CAPS_LOCK, | 341 TOGGLE_CAPS_LOCK, |
| 342 TOGGLE_HIGH_CONTRAST, |
| 343 TOGGLE_SPOKEN_FEEDBACK, | 343 TOGGLE_SPOKEN_FEEDBACK, |
| 344 TOGGLE_MIRROR_MODE, | 344 TOGGLE_MIRROR_MODE, |
| 345 TOGGLE_WIFI, | 345 TOGGLE_WIFI, |
| 346 TOUCH_HUD_CLEAR, | 346 TOUCH_HUD_CLEAR, |
| 347 VOLUME_DOWN, | 347 VOLUME_DOWN, |
| 348 VOLUME_MUTE, | 348 VOLUME_MUTE, |
| 349 VOLUME_UP, | 349 VOLUME_UP, |
| 350 #endif | 350 #endif |
| 351 #if defined(OS_CHROMEOS) && !defined(NDEBUG) | 351 #if defined(OS_CHROMEOS) && !defined(NDEBUG) |
| 352 POWER_PRESSED, | 352 POWER_PRESSED, |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 DISABLE_CAPS_LOCK, | 396 DISABLE_CAPS_LOCK, |
| 397 KEYBOARD_BRIGHTNESS_DOWN, | 397 KEYBOARD_BRIGHTNESS_DOWN, |
| 398 KEYBOARD_BRIGHTNESS_UP, | 398 KEYBOARD_BRIGHTNESS_UP, |
| 399 LOCK_SCREEN, | 399 LOCK_SCREEN, |
| 400 POWER_PRESSED, | 400 POWER_PRESSED, |
| 401 POWER_RELEASED, | 401 POWER_RELEASED, |
| 402 SHOW_IME_MENU_BUBBLE, | 402 SHOW_IME_MENU_BUBBLE, |
| 403 SUSPEND, | 403 SUSPEND, |
| 404 SWAP_PRIMARY_DISPLAY, | 404 SWAP_PRIMARY_DISPLAY, |
| 405 TOGGLE_CAPS_LOCK, | 405 TOGGLE_CAPS_LOCK, |
| 406 TOGGLE_HIGH_CONTRAST, |
| 406 TOGGLE_MIRROR_MODE, | 407 TOGGLE_MIRROR_MODE, |
| 407 TOGGLE_SPOKEN_FEEDBACK, | 408 TOGGLE_SPOKEN_FEEDBACK, |
| 408 TOGGLE_WIFI, | 409 TOGGLE_WIFI, |
| 409 VOLUME_DOWN, | 410 VOLUME_DOWN, |
| 410 VOLUME_MUTE, | 411 VOLUME_MUTE, |
| 411 VOLUME_UP, | 412 VOLUME_UP, |
| 412 #endif | 413 #endif |
| 413 }; | 414 }; |
| 414 | 415 |
| 415 const size_t kActionsAllowedAtModalWindowLength = | 416 const size_t kActionsAllowedAtModalWindowLength = |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 DEV_ADD_REMOVE_DISPLAY, | 459 DEV_ADD_REMOVE_DISPLAY, |
| 459 DEBUG_TOGGLE_TOUCH_PAD, | 460 DEBUG_TOGGLE_TOUCH_PAD, |
| 460 DEBUG_TOGGLE_TOUCH_SCREEN, | 461 DEBUG_TOGGLE_TOUCH_SCREEN, |
| 461 DISABLE_CAPS_LOCK, | 462 DISABLE_CAPS_LOCK, |
| 462 KEYBOARD_BRIGHTNESS_DOWN, | 463 KEYBOARD_BRIGHTNESS_DOWN, |
| 463 KEYBOARD_BRIGHTNESS_UP, | 464 KEYBOARD_BRIGHTNESS_UP, |
| 464 POWER_PRESSED, | 465 POWER_PRESSED, |
| 465 POWER_RELEASED, | 466 POWER_RELEASED, |
| 466 SWAP_PRIMARY_DISPLAY, | 467 SWAP_PRIMARY_DISPLAY, |
| 467 TOGGLE_CAPS_LOCK, | 468 TOGGLE_CAPS_LOCK, |
| 469 TOGGLE_HIGH_CONTRAST, |
| 468 TOGGLE_MIRROR_MODE, | 470 TOGGLE_MIRROR_MODE, |
| 469 TOGGLE_SPOKEN_FEEDBACK, | 471 TOGGLE_SPOKEN_FEEDBACK, |
| 470 TOGGLE_WIFI, | 472 TOGGLE_WIFI, |
| 471 TOUCH_HUD_CLEAR, | 473 TOUCH_HUD_CLEAR, |
| 472 VOLUME_DOWN, | 474 VOLUME_DOWN, |
| 473 VOLUME_MUTE, | 475 VOLUME_MUTE, |
| 474 VOLUME_UP, | 476 VOLUME_UP, |
| 475 #endif // defined(OS_CHROMEOS) | 477 #endif // defined(OS_CHROMEOS) |
| 476 }; | 478 }; |
| 477 | 479 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 #if defined(OS_CHROMEOS) | 523 #if defined(OS_CHROMEOS) |
| 522 BRIGHTNESS_DOWN, | 524 BRIGHTNESS_DOWN, |
| 523 BRIGHTNESS_UP, | 525 BRIGHTNESS_UP, |
| 524 DEBUG_TOGGLE_TOUCH_PAD, | 526 DEBUG_TOGGLE_TOUCH_PAD, |
| 525 DEBUG_TOGGLE_TOUCH_SCREEN, | 527 DEBUG_TOGGLE_TOUCH_SCREEN, |
| 526 DISABLE_CAPS_LOCK, | 528 DISABLE_CAPS_LOCK, |
| 527 KEYBOARD_BRIGHTNESS_DOWN, | 529 KEYBOARD_BRIGHTNESS_DOWN, |
| 528 KEYBOARD_BRIGHTNESS_UP, | 530 KEYBOARD_BRIGHTNESS_UP, |
| 529 TOGGLE_APP_LIST, | 531 TOGGLE_APP_LIST, |
| 530 TOGGLE_CAPS_LOCK, | 532 TOGGLE_CAPS_LOCK, |
| 533 TOGGLE_HIGH_CONTRAST, |
| 531 TOGGLE_SPOKEN_FEEDBACK, | 534 TOGGLE_SPOKEN_FEEDBACK, |
| 532 TOGGLE_WIFI, | 535 TOGGLE_WIFI, |
| 533 VOLUME_DOWN, | 536 VOLUME_DOWN, |
| 534 VOLUME_MUTE, | 537 VOLUME_MUTE, |
| 535 VOLUME_UP, | 538 VOLUME_UP, |
| 536 #endif // defined(OS_CHROMEOS) | 539 #endif // defined(OS_CHROMEOS) |
| 537 }; | 540 }; |
| 538 | 541 |
| 539 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 542 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
| 540 | 543 |
| 541 } // namespace ash | 544 } // namespace ash |
| OLD | NEW |