| 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 false // Old accelerator has been disabled. | 230 false // Old accelerator has been disabled. |
| 231 }}; | 231 }}; |
| 232 | 232 |
| 233 const size_t kDeprecatedAcceleratorsDataLength = | 233 const size_t kDeprecatedAcceleratorsDataLength = |
| 234 arraysize(kDeprecatedAcceleratorsData); | 234 arraysize(kDeprecatedAcceleratorsData); |
| 235 | 235 |
| 236 #endif // defined(OS_CHROMEOS) | 236 #endif // defined(OS_CHROMEOS) |
| 237 | 237 |
| 238 const AcceleratorData kDebugAcceleratorData[] = { | 238 const AcceleratorData kDebugAcceleratorData[] = { |
| 239 #if defined(OS_CHROMEOS) | 239 #if defined(OS_CHROMEOS) |
| 240 {true, ui::VKEY_N, kDebugModifier, TOGGLE_WIFI}, |
| 240 {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST}, | 241 {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST}, |
| 241 {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | 242 {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, |
| 242 DEBUG_TOGGLE_TOUCH_PAD}, | 243 DEBUG_TOGGLE_TOUCH_PAD}, |
| 243 {true, ui::VKEY_T, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | 244 {true, ui::VKEY_T, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, |
| 244 DEBUG_TOGGLE_TOUCH_SCREEN}, | 245 DEBUG_TOGGLE_TOUCH_SCREEN}, |
| 245 {true, ui::VKEY_T, kDebugModifier, DEBUG_TOGGLE_TOUCH_VIEW}, | 246 {true, ui::VKEY_T, kDebugModifier, DEBUG_TOGGLE_TOUCH_VIEW}, |
| 246 #endif // defined(OS_CHROMEOS) | 247 #endif // defined(OS_CHROMEOS) |
| 247 {true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 248 {true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 248 DEBUG_TOGGLE_WALLPAPER_MODE}, | 249 DEBUG_TOGGLE_WALLPAPER_MODE}, |
| 249 {true, ui::VKEY_L, kDebugModifier, DEBUG_PRINT_LAYER_HIERARCHY}, | 250 {true, ui::VKEY_L, kDebugModifier, DEBUG_PRINT_LAYER_HIERARCHY}, |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 TOGGLE_WIFI, | 539 TOGGLE_WIFI, |
| 539 VOLUME_DOWN, | 540 VOLUME_DOWN, |
| 540 VOLUME_MUTE, | 541 VOLUME_MUTE, |
| 541 VOLUME_UP, | 542 VOLUME_UP, |
| 542 #endif // defined(OS_CHROMEOS) | 543 #endif // defined(OS_CHROMEOS) |
| 543 }; | 544 }; |
| 544 | 545 |
| 545 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 546 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
| 546 | 547 |
| 547 } // namespace ash | 548 } // namespace ash |
| OLD | NEW |