| 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 28 matching lines...) Expand all Loading... |
| 39 SELECT_WIN_6, | 39 SELECT_WIN_6, |
| 40 SELECT_WIN_7, | 40 SELECT_WIN_7, |
| 41 SHOW_OAK, | 41 SHOW_OAK, |
| 42 SWITCH_IME, // Switch to another IME depending on the accelerator. | 42 SWITCH_IME, // Switch to another IME depending on the accelerator. |
| 43 TAKE_PARTIAL_SCREENSHOT, | 43 TAKE_PARTIAL_SCREENSHOT, |
| 44 TAKE_SCREENSHOT, | 44 TAKE_SCREENSHOT, |
| 45 TOGGLE_CAPS_LOCK, | 45 TOGGLE_CAPS_LOCK, |
| 46 VOLUME_DOWN, | 46 VOLUME_DOWN, |
| 47 VOLUME_MUTE, | 47 VOLUME_MUTE, |
| 48 VOLUME_UP, | 48 VOLUME_UP, |
| 49 WINDOW_MAXIMIZE_RESTORE, | |
| 50 WINDOW_MINIMIZE, | |
| 51 WINDOW_POSITION_CENTER, | |
| 52 WINDOW_SNAP_LEFT, | |
| 53 WINDOW_SNAP_RIGHT, | |
| 54 #if defined(OS_CHROMEOS) | 49 #if defined(OS_CHROMEOS) |
| 55 LOCK_SCREEN, | 50 LOCK_SCREEN, |
| 56 OPEN_CROSH, | 51 OPEN_CROSH, |
| 57 OPEN_FILE_MANAGER, | 52 OPEN_FILE_MANAGER, |
| 58 #endif | 53 #endif |
| 59 #if !defined(NDEBUG) | 54 #if !defined(NDEBUG) |
| 60 ADD_REMOVE_MONITOR, | 55 ADD_REMOVE_MONITOR, |
| 61 CYCLE_MONITOR, | 56 CYCLE_MONITOR, |
| 62 PRINT_LAYER_HIERARCHY, | 57 PRINT_LAYER_HIERARCHY, |
| 63 PRINT_WINDOW_HIERARCHY, | 58 PRINT_WINDOW_HIERARCHY, |
| (...skipping 20 matching lines...) Expand all Loading... |
| 84 | 79 |
| 85 // Actions allowed while user is not signed in or screen is locked. | 80 // Actions allowed while user is not signed in or screen is locked. |
| 86 extern const AcceleratorAction kActionsAllowedAtLoginScreen[]; | 81 extern const AcceleratorAction kActionsAllowedAtLoginScreen[]; |
| 87 | 82 |
| 88 // The number of elements in kActionsAllowedAtLoginScreen. | 83 // The number of elements in kActionsAllowedAtLoginScreen. |
| 89 extern const size_t kActionsAllowedAtLoginScreenLength; | 84 extern const size_t kActionsAllowedAtLoginScreenLength; |
| 90 | 85 |
| 91 } // namespace ash | 86 } // namespace ash |
| 92 | 87 |
| 93 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ | 88 #endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10223014:
Revert 133982 because it broke build on chromeos due to mid-air collision with 133961. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/