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

content/browser/cocoa/system_hotkey_map.mm

 // 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.
 
 #import "content/browser/cocoa/system_hotkey_map.h"
 
 #pragma mark - NSDictionary Helper Functions
 
 namespace {
 
@@ skipping 11 matching lines @@
 }
 
 NSArray* ArrayForKey(NSDictionary* dict, NSString* key) {
   return ObjectForKey(dict, key, [NSArray class]);
 }
 
 NSNumber* NumberForKey(NSDictionary* dict, NSString* key) {
   return ObjectForKey(dict, key, [NSNumber class]);
 }
 
+NSString* StringForKey(NSDictionary* dict, NSString* key) {
+  return ObjectForKey(dict, key, [NSString class]);
+}
+
 }  // namespace
 
 #pragma mark - SystemHotkey
 
 namespace content {
 
 struct SystemHotkey {
-  int key_code;
-  int modifiers;
+  unsigned short key_code;
+  NSUInteger modifiers;
 };
 
 #pragma mark - SystemHotkeyMap
 
 SystemHotkeyMap::SystemHotkeyMap() {
 }
 SystemHotkeyMap::~SystemHotkeyMap() {
 }
 
 NSDictionary* SystemHotkeyMap::DictionaryFromData(NSData* data) {
@@ skipping 35 matching lines @@
       continue;
 
     NSNumber* enabled = NumberForKey(hotkey_dictionary, @"enabled");
     if (!enabled || enabled.boolValue == NO)
       continue;
 
     NSDictionary* value = DictionaryForKey(hotkey_dictionary, @"value");
     if (!value)
       continue;
 
+    NSString* type = StringForKey(value, @"type");
+    if (!type || ![type isEqualToString:@"standard"])
+      continue;
+
     NSArray* parameters = ArrayForKey(value, @"parameters");
     if (!parameters || [parameters count] != 3)
       continue;
 
     NSNumber* key_code = [parameters objectAtIndex:1];
     if (![key_code isKindOfClass:[NSNumber class]])
       continue;
 
     NSNumber* modifiers = [parameters objectAtIndex:2];
     if (![modifiers isKindOfClass:[NSNumber class]])
       continue;
 
-    ReserveHotkey(key_code.intValue, modifiers.intValue, hotkey_system_effect);
+    ReserveHotkey(key_code.unsignedShortValue,
+                  modifiers.unsignedIntegerValue,
+                  hotkey_system_effect);
   }
 
   return true;
 }
 
 bool SystemHotkeyMap::IsEventReserved(NSEvent* event) const {
   NSUInteger modifiers =
       NSShiftKeyMask | NSControlKeyMask | NSCommandKeyMask | NSAlternateKeyMask;
   return IsHotkeyReserved(event.keyCode, event.modifierFlags & modifiers);
 }
 
-bool SystemHotkeyMap::IsHotkeyReserved(int key_code, int modifiers) const {
+bool SystemHotkeyMap::IsHotkeyReserved(unsigned short key_code,
+                                       NSUInteger modifiers) const {
   std::vector<SystemHotkey>::const_iterator it;
   for (it = system_hotkeys_.begin(); it != system_hotkeys_.end(); ++it) {
     if (it->key_code == key_code && it->modifiers == modifiers)
       return true;
   }
   return false;
 }
 
-void SystemHotkeyMap::ReserveHotkey(int key_code,
-                                    int modifiers,
+void SystemHotkeyMap::ReserveHotkey(unsigned short key_code,
+                                    NSUInteger modifiers,
                                     NSString* system_effect) {
   ReserveHotkey(key_code, modifiers);
 
   // If a hotkey exists for toggling through the windows of an application, then
   // adding shift to that hotkey toggles through the windows backwards.
   if ([system_effect isEqualToString:@"27"])
     ReserveHotkey(key_code, modifiers | NSShiftKeyMask);
 }
 
-void SystemHotkeyMap::ReserveHotkey(int key_code, int modifiers) {
+void SystemHotkeyMap::ReserveHotkey(unsigned short key_code,
+                                    NSUInteger modifiers) {
+  // Hotkeys require at least one of control, command, or alternate keys to be
+  // down.
+  NSUInteger required_modifiers =
+      NSControlKeyMask | NSCommandKeyMask | NSAlternateKeyMask;
+  if ((modifiers & required_modifiers) == 0)
+    return;
+
   SystemHotkey hotkey;
   hotkey.key_code = key_code;
   hotkey.modifiers = modifiers;
   system_hotkeys_.push_back(hotkey);
 }
 
 }  // namespace content