mac: Load the system hotkeys after launch. (reland)

content/browser/cocoa/system_hotkey_map.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_COCOA_SYSTEM_HOTKEY_MAP_H_
 #define CONTENT_BROWSER_COCOA_SYSTEM_HOTKEY_MAP_H_
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
@@ skipping 23 matching lines @@
   // Can be called multiple times. Only the results from the most recent
   // invocation are stored.
   bool ParseDictionary(NSDictionary* dictionary);
 
   // Whether the event corresponds to a hotkey that has been reserved by the
   // system.
   bool IsEventReserved(NSEvent* event) const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SystemHotkeyMapTest, Parse);
+  FRIEND_TEST_ALL_PREFIXES(SystemHotkeyMapTest, ParseMouse);
 
   // Whether the hotkey has been reserved by the user.
-  bool IsHotkeyReserved(int key_code, int modifiers) const;
+  bool IsHotkeyReserved(unsigned short key_code, NSUInteger modifiers) const;
 
   // Create at least one record of a hotkey that is reserved by the user.
   // Certain system hotkeys automatically reserve multiple key combinations.
-  void ReserveHotkey(int key_code, int modifiers, NSString* system_effect);
+  void ReserveHotkey(unsigned short key_code,
+                     NSUInteger modifiers,
+                     NSString* system_effect);
 
   // Create a record of a hotkey that is reserved by the user.
-  void ReserveHotkey(int key_code, int modifiers);
+  void ReserveHotkey(unsigned short key_code, NSUInteger modifiers);
 
   std::vector<SystemHotkey> system_hotkeys_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemHotkeyMap);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COCOA_SYSTEM_HOTKEY_MAP_H_