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 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ | 5 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |
| 6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ | 6 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "ash/ash_export.h" | 9 #include "ash/ash_export.h" |
| 10 #include "ui/aura/event.h" | 10 #include "ui/aura/event.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 WINDOW_POSITION_CENTER, | 60 WINDOW_POSITION_CENTER, |
| 61 WINDOW_SNAP_LEFT, | 61 WINDOW_SNAP_LEFT, |
| 62 WINDOW_SNAP_RIGHT, | 62 WINDOW_SNAP_RIGHT, |
| 63 #if defined(OS_CHROMEOS) | 63 #if defined(OS_CHROMEOS) |
| 64 CYCLE_DISPLAY_MODE, | 64 CYCLE_DISPLAY_MODE, |
| 65 LOCK_SCREEN, | 65 LOCK_SCREEN, |
| 66 OPEN_CROSH, | 66 OPEN_CROSH, |
| 67 OPEN_FILE_MANAGER_DIALOG, | 67 OPEN_FILE_MANAGER_DIALOG, |
| 68 OPEN_FILE_MANAGER_TAB, | 68 OPEN_FILE_MANAGER_TAB, |
| 69 #endif | 69 #endif |
| 70 OPEN_FEEDBACK_PAGE, | |
|
Yusuke Sato
2012/07/09 17:49:59
can you merge line 70-76 into 17-62 and sort them
Jun Mukai
2012/07/10 11:08:20
Done.
| |
| 70 DISPLAY_ADD_REMOVE, | 71 DISPLAY_ADD_REMOVE, |
| 71 DISPLAY_CYCLE, | 72 DISPLAY_CYCLE, |
| 72 DISPLAY_TOGGLE_SCALE, | 73 DISPLAY_TOGGLE_SCALE, |
| 73 ROTATE_SCREEN, | 74 ROTATE_SCREEN, |
| 74 TOGGLE_DESKTOP_BACKGROUND_MODE, | 75 TOGGLE_DESKTOP_BACKGROUND_MODE, |
| 75 TOGGLE_ROOT_WINDOW_FULL_SCREEN, | 76 TOGGLE_ROOT_WINDOW_FULL_SCREEN, |
| 76 #if !defined(NDEBUG) | 77 #if !defined(NDEBUG) |
| 77 PRINT_LAYER_HIERARCHY, | 78 PRINT_LAYER_HIERARCHY, |
| 78 PRINT_WINDOW_HIERARCHY, | 79 PRINT_WINDOW_HIERARCHY, |
| 79 #endif | 80 #endif |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 108 // Actions allowed while screen is locked (in addition to | 109 // Actions allowed while screen is locked (in addition to |
| 109 // kActionsAllowedAtLoginOrLockScreen). | 110 // kActionsAllowedAtLoginOrLockScreen). |
| 110 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[]; | 111 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[]; |
| 111 | 112 |
| 112 // The number of elements in kActionsAllowedAtLockScreen. | 113 // The number of elements in kActionsAllowedAtLockScreen. |
| 113 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength; | 114 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength; |
| 114 | 115 |
| 115 } // namespace ash | 116 } // namespace ash |
| 116 | 117 |
| 117 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ | 118 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |
| OLD | NEW |