Index: ui/aura_shell/shell_accelerator_controller.h |
diff --git a/ui/aura_shell/shell_accelerator_controller.h b/ui/aura_shell/shell_accelerator_controller.h |
index 86fe41b9b3adfce1d29c157f1df1b87360fec682..d0bb7028b213870e5d9e7e8d90eb57c08416bff9 100644 |
--- a/ui/aura_shell/shell_accelerator_controller.h |
+++ b/ui/aura_shell/shell_accelerator_controller.h |
@@ -6,6 +6,8 @@ |
#define UI_AURA_SHELL_SHELL_ACCELERATOR_CONTROLLER_H_ |
#pragma once |
+#include <map> |
+ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
@@ -52,8 +54,14 @@ class AURA_SHELL_EXPORT ShellAcceleratorController |
virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; |
private: |
+ // Initialize the accelerators this class handles as a target. |
+ void Init(); |
+ |
scoped_ptr<ui::AcceleratorManager> accelerator_manager_; |
+ // A map from accelerators to action IDs used in the implementation. |
Daniel Erat
2011/11/30 20:47:36
instead of "action IDs", mind saying "AcceleratorA
mazda
2011/12/01 06:06:19
Done.
|
+ std::map<ui::Accelerator, int> accelerators_; |
+ |
DISALLOW_COPY_AND_ASSIGN(ShellAcceleratorController); |
}; |