Chromium Code Reviews| 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 231 false // Old accelerator has been disabled. | 231 false // Old accelerator has been disabled. |
| 232 }}; | 232 }}; |
| 233 | 233 |
| 234 const size_t kDeprecatedAcceleratorsDataLength = | 234 const size_t kDeprecatedAcceleratorsDataLength = |
| 235 arraysize(kDeprecatedAcceleratorsData); | 235 arraysize(kDeprecatedAcceleratorsData); |
| 236 | 236 |
| 237 #endif // defined(OS_CHROMEOS) | 237 #endif // defined(OS_CHROMEOS) |
| 238 | 238 |
| 239 const AcceleratorData kDebugAcceleratorData[] = { | 239 const AcceleratorData kDebugAcceleratorData[] = { |
| 240 #if defined(OS_CHROMEOS) | 240 #if defined(OS_CHROMEOS) |
| 241 {true, ui::VKEY_N, kDebugModifier, TOGGLE_WIFI}, | |
|
varkha
2016/09/19 20:19:23
[self review] Split this in a separate CL.
varkha
2016/09/23 00:35:53
Done.
| |
| 241 {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST}, | 242 {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST}, |
| 242 {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | 243 {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, |
| 243 DEBUG_TOGGLE_TOUCH_PAD}, | 244 DEBUG_TOGGLE_TOUCH_PAD}, |
| 244 {true, ui::VKEY_T, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | 245 {true, ui::VKEY_T, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, |
| 245 DEBUG_TOGGLE_TOUCH_SCREEN}, | 246 DEBUG_TOGGLE_TOUCH_SCREEN}, |
| 246 {true, ui::VKEY_T, kDebugModifier, DEBUG_TOGGLE_TOUCH_VIEW}, | 247 {true, ui::VKEY_T, kDebugModifier, DEBUG_TOGGLE_TOUCH_VIEW}, |
| 247 #endif // defined(OS_CHROMEOS) | 248 #endif // defined(OS_CHROMEOS) |
| 248 {true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 249 {true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 249 DEBUG_TOGGLE_WALLPAPER_MODE}, | 250 DEBUG_TOGGLE_WALLPAPER_MODE}, |
| 250 {true, ui::VKEY_L, kDebugModifier, DEBUG_PRINT_LAYER_HIERARCHY}, | 251 {true, ui::VKEY_L, kDebugModifier, DEBUG_PRINT_LAYER_HIERARCHY}, |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 535 TOGGLE_WIFI, | 536 TOGGLE_WIFI, |
| 536 VOLUME_DOWN, | 537 VOLUME_DOWN, |
| 537 VOLUME_MUTE, | 538 VOLUME_MUTE, |
| 538 VOLUME_UP, | 539 VOLUME_UP, |
| 539 #endif // defined(OS_CHROMEOS) | 540 #endif // defined(OS_CHROMEOS) |
| 540 }; | 541 }; |
| 541 | 542 |
| 542 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 543 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
| 543 | 544 |
| 544 } // namespace ash | 545 } // namespace ash |
| OLD | NEW |