Chromium Code Reviews| Index: ash/accelerators/accelerator_table.h |
| diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h |
| index b28e4e93ee69bf5aac8a37170ed0104f1cb29ef8..caaac798ae5be4b869e2b157321956ed6a3e5f8a 100644 |
| --- a/ash/accelerators/accelerator_table.h |
| +++ b/ash/accelerators/accelerator_table.h |
| @@ -21,8 +21,11 @@ enum AcceleratorAction { |
| CYCLE_BACKWARD_MRU, |
| CYCLE_FORWARD_LINEAR, |
| CYCLE_FORWARD_MRU, |
| + DEBUG_TOGGLE_DEVICE_SCALE_FACTOR, |
| + DEBUG_TOGGLE_SHOW_DEBUG_BORDERS, |
| + DEBUG_TOGGLE_SHOW_FPS_COUNTER, |
| + DEBUG_TOGGLE_SHOW_PAINT_RECTS, |
| DISABLE_CAPS_LOCK, |
| - DISPLAY_TOGGLE_SCALE, |
| EXIT, |
| FOCUS_LAUNCHER, |
| FOCUS_NEXT_PANE, |
| @@ -94,11 +97,9 @@ enum AcceleratorAction { |
| OPEN_FILE_MANAGER, |
| DISABLE_GPU_WATCHDOG, |
| #endif |
| -#if !defined(NDEBUG) |
| PRINT_LAYER_HIERARCHY, |
| PRINT_VIEW_HIERARCHY, |
| PRINT_WINDOW_HIERARCHY, |
| -#endif |
| }; |
| struct AcceleratorData { |
| @@ -114,6 +115,14 @@ ASH_EXPORT extern const AcceleratorData kAcceleratorData[]; |
| // The number of elements in kAcceleratorData. |
| ASH_EXPORT extern const size_t kAcceleratorDataLength; |
| +#if !defined(NDEBUG) |
| +// Debug accelerators enabled only on debug build. |
|
James Cook
2013/04/22 21:51:58
Debug build? Or desktop build?
oshima
2013/04/22 23:07:40
updated the comment.
|
| +ASH_EXPORT extern const AcceleratorData kDesktopAcceleratorData[]; |
| + |
| +// The number of elements in kDesktopAcceleratorData. |
| +ASH_EXPORT extern const size_t kDesktopAcceleratorDataLength; |
| +#endif |
| + |
| // Debug accelerators enabled only when "Debugging keyboard shortcuts" flag |
| // (--ash-debug-shortcuts) is enabled. |
| ASH_EXPORT extern const AcceleratorData kDebugAcceleratorData[]; |