mac: Create a static mapping of accelerators in the main menu.

chrome/browser/ui/cocoa/accelerators_cocoa.h

Index: chrome/browser/ui/cocoa/accelerators_cocoa.h
diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h
index cc1840ca5fb18b093e1a96449e2f6ba08c703992..1bd9c8730b003430cb4cec0bfc9e4018326eb2d5 100644
--- a/chrome/browser/ui/cocoa/accelerators_cocoa.h
+++ b/chrome/browser/ui/cocoa/accelerators_cocoa.h
@@ -5,8 +5,11 @@
 #ifndef CHROME_BROWSER_UI_COCOA_ACCELERATORS_COCOA_H_
 #define CHROME_BROWSER_UI_COCOA_ACCELERATORS_COCOA_H_
 
+#import <Cocoa/Cocoa.h>

[Robert Sesek, 2014/02/11 16:19:48]

nit: blank line after, to separate C and C++ includes

[erikchen, 2014/02/11 19:42:27]

Done.

 #include <map>
+#include <vector>
 
+#include "base/gtest_prod_util.h"
 #include "ui/base/accelerators/accelerator.h"
 
 template <typename T> struct DefaultSingletonTraits;
@@ -26,6 +29,7 @@ template <typename T> struct DefaultSingletonTraits;
 class AcceleratorsCocoa {
  public:
   typedef std::map<int, ui::Accelerator> AcceleratorMap;
+  typedef std::vector<ui::Accelerator> AcceleratorVector;
   typedef AcceleratorMap::const_iterator const_iterator;
 
   const_iterator const begin() { return accelerators_.begin(); }
@@ -33,17 +37,30 @@ class AcceleratorsCocoa {
 
   // Returns NULL if there is no accelerator for the command.
   const ui::Accelerator* GetAcceleratorForCommand(int command_id);
+  // Searches the list of accelerators without a command_id for an accelerator
+  // that matches the given |keyEquivalent| and |modifiers|.
+  const ui::Accelerator* GetAcceleratorForHotKey(

[Robert Sesek, 2014/02/11 16:19:48]

Can this method be const, too?

[erikchen, 2014/02/11 19:42:27]

Done.

+    NSString* keyEquivalent, NSUInteger modifiers);

[Robert Sesek, 2014/02/11 16:19:48]

naming: key_equivalent (and in the comment).

[erikchen, 2014/02/11 19:42:27]

Done.

 
   // Returns the singleton instance.
   static AcceleratorsCocoa* GetInstance();
 
  private:
   friend struct DefaultSingletonTraits<AcceleratorsCocoa>;
+  FRIEND_TEST_ALL_PREFIXES(AcceleratorsCocoaBrowsertest,
+                           MappingAcceleratorsInMainMenu);
 
   AcceleratorsCocoa();
   ~AcceleratorsCocoa();
 
+  // A map from command_id to Accelerator. The accelerator is fully filled out,
+  // and its platform_accelerator is also fully filled out.
+  // Contains accelerators from both the wrench menu and the main menu.
   AcceleratorMap accelerators_;
+  // A list of accelerators used in the main menu that have no associated
+  // command_id. The accelerator is fully filled out, and its
+  // platform_accelerator is also fully filled out.
+  AcceleratorVector acceleratorVector_;

[Robert Sesek, 2014/02/11 16:19:48]

naming: accelerator_vector_

[erikchen, 2014/02/11 19:42:27]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorsCocoa);
 };