Add default hotkey dictionary for com.apple.symbolichotkeys.plist

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 15 matching lines @@
 }
 
 NSNumber* NumberForKey(NSDictionary* dict, NSString* key) {
   return ObjectForKey(dict, key, [NSNumber class]);
 }
 
 NSString* StringForKey(NSDictionary* dict, NSString* key) {
   return ObjectForKey(dict, key, [NSString class]);
 }
 
+NSDictionary* kDefaultSymbolicHotKeys = @{
+  // Default Window switch key binding: Command + `
+  @"27" : @{
+    @"enabled" : @YES,
+    @"value" : @{
+      @"type" : @"standard",
+      @"parameters" : @[ @96, @50, @1048576 ],

[erikchen, 2016/04/01 03:55:12]

Where did these numbers come from?

[chongz, 2016/04/01 19:47:18]

They come from my local file, replaced with meaningful names (have no idea what
@96 means, but it's not used in our code)

+    }
+  }
+};
+
 }  // namespace
 
 #pragma mark - SystemHotkey
 
 namespace content {
 
 struct SystemHotkey {
   unsigned short key_code;
   NSUInteger modifiers;
 };
@@ skipping 22 matching lines @@
 
   return dictionary;
 }
 
 bool SystemHotkeyMap::ParseDictionary(NSDictionary* dictionary) {
   system_hotkeys_.clear();
 
   if (!dictionary)
     return false;
 
-  NSDictionary* hotkey_dictionaries =
+  NSDictionary* user_hotkey_dictionaries =
       DictionaryForKey(dictionary, @"AppleSymbolicHotKeys");
-  if (!hotkey_dictionaries)
+  if (!user_hotkey_dictionaries)
     return false;
 
+  // Safe for user disabled hotkeys. If a hotkey was disabled it will have

[erikchen, 2016/04/01 03:55:11]

I don't understand your comment. I think you are trying to say:

"""
Start with a dictionary of default OS X hotkeys that are not necessarily listed
in com.apple.symbolichotkeys.plist. If the user has overridden any of these
hotkeys, -NSMutableDictionary addEntriesFromDictionary:] will ensure that the
new values are used.
"""

[chongz, 2016/04/01 19:47:18]

Done. I was trying to emphasize that not only modified hotkeys but also disabled
hotkeys are handled.

+  // |enabled| set to "NO" instead of removed from |user_hotkey_dictionaries|.

[erikchen, 2016/04/01 03:55:11]

Add a link to https://bugs.chromium.org/p/chromium/issues/detail?id=145062#c8

[chongz, 2016/04/01 19:47:18]

Done.

+  NSMutableDictionary* hotkey_dictionaries =
+      [kDefaultSymbolicHotKeys mutableCopy];

[erikchen, 2016/04/01 03:55:12]

You are leaking a reference. Use scoped_nsobject.

[chongz, 2016/04/01 19:47:17]

Done.

+  [hotkey_dictionaries addEntriesFromDictionary:user_hotkey_dictionaries];
+
   for (NSString* hotkey_system_effect in [hotkey_dictionaries allKeys]) {
     if (![hotkey_system_effect isKindOfClass:[NSString class]])
       continue;
 
     NSDictionary* hotkey_dictionary =
         [hotkey_dictionaries objectForKey:hotkey_system_effect];
     if (![hotkey_dictionary isKindOfClass:[NSDictionary class]])
       continue;
 
     NSNumber* enabled = NumberForKey(hotkey_dictionary, @"enabled");
@@ skipping 63 matching lines @@
   if ((modifiers & required_modifiers) == 0)
     return;
 
   SystemHotkey hotkey;
   hotkey.key_code = key_code;
   hotkey.modifiers = modifiers;
   system_hotkeys_.push_back(hotkey);
 }
 
 }  // namespace content