Index: ash/accelerators/accelerator_action.h |
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_action.h |
similarity index 55% |
copy from ash/accelerators/accelerator_table.h |
copy to ash/accelerators/accelerator_action.h |
index 788de46e5c83d875bf7dae22d8b4e5563475d7db..e433a4c596435f3e2f99a6ef68b803ccf1711e9e 100644 |
--- a/ash/accelerators/accelerator_table.h |
+++ b/ash/accelerators/accelerator_action.h |
@@ -2,13 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |
-#define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |
+#ifndef ASH_ACCELERATORS_ACTION_TABLE_H_ |
+#define ASH_ACCELERATORS_ACTION_TABLE_H_ |
#pragma once |
-#include "ash/ash_export.h" |
-#include "ui/aura/event.h" |
- |
namespace ash { |
// Please put if/def sections at the end of the bare section and keep the list |
@@ -79,39 +76,6 @@ enum AcceleratorAction { |
#endif |
}; |
-struct AcceleratorData { |
- bool trigger_on_press; |
- ui::KeyboardCode keycode; |
- int modifiers; |
- AcceleratorAction action; |
-}; |
- |
-// Accelerators handled by AcceleratorController. |
-ASH_EXPORT extern const AcceleratorData kAcceleratorData[]; |
- |
-// The number of elements in kAcceleratorData. |
-ASH_EXPORT extern const size_t kAcceleratorDataLength; |
- |
-// Actions that should be handled very early in Ash unless the current target |
-// window is full-screen. |
-ASH_EXPORT extern const AcceleratorAction kReservedActions[]; |
- |
-// The number of elements in kReservedActions. |
-ASH_EXPORT extern const size_t kReservedActionsLength; |
- |
-// Actions allowed while user is not signed in or screen is locked. |
-ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[]; |
- |
-// The number of elements in kActionsAllowedAtLoginOrLockScreen. |
-ASH_EXPORT extern const size_t kActionsAllowedAtLoginOrLockScreenLength; |
- |
-// Actions allowed while screen is locked (in addition to |
-// kActionsAllowedAtLoginOrLockScreen). |
-ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[]; |
- |
-// The number of elements in kActionsAllowedAtLockScreen. |
-ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength; |
- |
} // namespace ash |
#endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_ |