Index: ash/accelerators/accelerator_controller.h |
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h |
index ee4ddfc00c6d06b56a20543774d1d263d9131507..7ea486d80b1ce497f67cc94149892fde3ed7c76d 100644 |
--- a/ash/accelerators/accelerator_controller.h |
+++ b/ash/accelerators/accelerator_controller.h |
@@ -8,6 +8,7 @@ |
#include <map> |
#include <set> |
+#include "ash/accelerators/accelerator_table.h" |
#include "ash/accelerators/exit_warning_handler.h" |
#include "ash/ash_export.h" |
#include "base/basictypes.h" |
@@ -22,7 +23,6 @@ class AcceleratorManager; |
namespace ash { |
-struct AcceleratorData; |
class BrightnessControlDelegate; |
class ExitWarningHandler; |
class ImeControlDelegate; |
@@ -65,6 +65,10 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget { |
AcceleratorController(); |
virtual ~AcceleratorController(); |
+ // Installs/Uninstalls accelerators for the magnified screen. |
+ void InstallMagnifierAccelerators(); |
+ void UninstallMagnifierAccelerators(); |
+ |
// Registers a global keyboard accelerator for the specified target. If |
// multiple targets are registered for an accelerator, a target registered |
// later has higher priority. |
@@ -131,9 +135,14 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget { |
// Initializes the accelerators this class handles as a target. |
void Init(); |
- // Registers the specified accelerators. |
+ // Registers/Unregisters the specified accelerators. |
void RegisterAccelerators(const AcceleratorData accelerators[], |
size_t accelerators_length); |
+ void UnregisterAccelerators(const AcceleratorData accelerators[], |
+ size_t accelerators_length); |
+ |
+ void AddReservedAction(AcceleratorAction action); |
+ void RemoveReservedAction(AcceleratorAction action); |
void SetKeyboardBrightnessControlDelegate( |
scoped_ptr<KeyboardBrightnessControlDelegate> |