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"
 
+#import <Carbon/Carbon.h>
+
+#include "base/mac/scoped_nsobject.h"
+
 #pragma mark - NSDictionary Helper Functions
 
 namespace {
 
 // All 4 following functions return nil if the object doesn't exist, or isn't of
 // the right class.
 id ObjectForKey(NSDictionary* dict, NSString* key, Class aClass) {
   id object = [dict objectForKey:key];
   if (![object isKindOfClass:aClass])
     return nil;
   return object;
 }
 
 NSDictionary* DictionaryForKey(NSDictionary* dict, NSString* key) {
   return ObjectForKey(dict, key, [NSDictionary class]);
 }
 
 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]);
 }
 
+NSDictionary* kDefaultSymbolicHotKeys = @{

[Avi (use Gerrit), 2016/04/01 20:03:56]

Does using @{} at the top level cause static initialization code?

http://clang.llvm.org/docs/ObjectiveCLiterals.html implies that this turns into
a call to +[NSDictionary dictionaryWithObjects:forKeys:count:], which is
runtime.

You might need to put this into a function.

[chongz, 2016/04/01 20:46:46]

Done.

+  // Default Window switch key binding: Command + `
+  // Copied from local com.apple.symbolichotkeys.plist file since @"27" might
+  // missing but should still be handled as reserved.
+  // Note: The first parameter @96 is not used by |SystemHotkeyMap|.
+  @"27" : @{
+    @"enabled" : @YES,
+    @"value" : @{
+      @"type" : @"standard",
+      @"parameters" :
+          @[ @96 /* unused */, @(kVK_ANSI_Grave), @(NSCommandKeyMask) ],
+    }
+  }
+};
+
 }  // 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;
 
+  // Start with a dictionary of default OS X hotkeys that are not necessarily
+  // listed in com.apple.symbolichotkeys.plist. If the user has overridden or
+  // disabled any of these hotkeys,
+  // -NSMutableDictionary addEntriesFromDictionary:] will ensure that the new
+  // values are used.
+  // See https://crbug.com/145062#c8
+  base::scoped_nsobject<NSMutableDictionary> hotkey_dictionaries(
+      [kDefaultSymbolicHotKeys mutableCopy]);
+  [hotkey_dictionaries addEntriesFromDictionary:user_hotkey_dictionaries];

[Avi (use Gerrit), 2016/04/01 20:03:56]

... or rather than having a "constant" global kDefaultSymbolicHotKeys and making
a mutable copy, just put the @{} here and always parse it.

[chongz, 2016/04/01 20:46:46]

Didn't find a way to initialize NSMutableDictionary from @{}, I guess I have to
use mutableCopy? 

+
   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