| 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF}, | 129 {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SHELF}, |
| 130 {true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY}, | 130 {true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY}, |
| 131 {true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 131 {true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 132 SHOW_KEYBOARD_OVERLAY}, | 132 SHOW_KEYBOARD_OVERLAY}, |
| 133 {true, ui::VKEY_OEM_2, | 133 {true, ui::VKEY_OEM_2, |
| 134 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 134 ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 135 SHOW_KEYBOARD_OVERLAY}, | 135 SHOW_KEYBOARD_OVERLAY}, |
| 136 {true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY}, | 136 {true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY}, |
| 137 {true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 137 {true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 138 SHOW_MESSAGE_CENTER_BUBBLE}, | 138 SHOW_MESSAGE_CENTER_BUBBLE}, |
| 139 #if defined(OS_CHROMEOS) |
| 140 {true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, SHOW_STYLUS_TOOLS}, |
| 141 #endif |
| 139 {true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 142 {true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 140 SHOW_SYSTEM_TRAY_BUBBLE}, | 143 SHOW_SYSTEM_TRAY_BUBBLE}, |
| 141 {true, ui::VKEY_1, ui::EF_ALT_DOWN, LAUNCH_APP_0}, | 144 {true, ui::VKEY_1, ui::EF_ALT_DOWN, LAUNCH_APP_0}, |
| 142 {true, ui::VKEY_2, ui::EF_ALT_DOWN, LAUNCH_APP_1}, | 145 {true, ui::VKEY_2, ui::EF_ALT_DOWN, LAUNCH_APP_1}, |
| 143 {true, ui::VKEY_3, ui::EF_ALT_DOWN, LAUNCH_APP_2}, | 146 {true, ui::VKEY_3, ui::EF_ALT_DOWN, LAUNCH_APP_2}, |
| 144 {true, ui::VKEY_4, ui::EF_ALT_DOWN, LAUNCH_APP_3}, | 147 {true, ui::VKEY_4, ui::EF_ALT_DOWN, LAUNCH_APP_3}, |
| 145 {true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4}, | 148 {true, ui::VKEY_5, ui::EF_ALT_DOWN, LAUNCH_APP_4}, |
| 146 {true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5}, | 149 {true, ui::VKEY_6, ui::EF_ALT_DOWN, LAUNCH_APP_5}, |
| 147 {true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6}, | 150 {true, ui::VKEY_7, ui::EF_ALT_DOWN, LAUNCH_APP_6}, |
| 148 {true, ui::VKEY_8, ui::EF_ALT_DOWN, LAUNCH_APP_7}, | 151 {true, ui::VKEY_8, ui::EF_ALT_DOWN, LAUNCH_APP_7}, |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 520 TOGGLE_WIFI, | 523 TOGGLE_WIFI, |
| 521 VOLUME_DOWN, | 524 VOLUME_DOWN, |
| 522 VOLUME_MUTE, | 525 VOLUME_MUTE, |
| 523 VOLUME_UP, | 526 VOLUME_UP, |
| 524 #endif // defined(OS_CHROMEOS) | 527 #endif // defined(OS_CHROMEOS) |
| 525 }; | 528 }; |
| 526 | 529 |
| 527 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 530 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
| 528 | 531 |
| 529 } // namespace ash | 532 } // namespace ash |
| OLD | NEW |