Register global accelerators and add placeholders for handling them.

ui/aura_shell/shell_accelerator_controller.h

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 14f1f3aab9a49b95e2a5d54d15ad565f6214c74f..d364608942219c2f843cfcafad5f96824c4e943a 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,7 +54,11 @@ 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_;
+  std::map<ui::Accelerator, int> accelerators_;

[Daniel Erat, 2011/11/28 16:39:54]

add a comment describing what the int value represents

[mazda, 2011/11/29 15:19:35]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(ShellAcceleratorController);
 };