mac: Load the system hotkeys after launch.

content/browser/cocoa/system_hotkey_map.mm

Index: content/browser/cocoa/system_hotkey_map.mm
diff --git a/chrome/browser/ui/cocoa/system_hotkey_map.mm b/content/browser/cocoa/system_hotkey_map.mm
similarity index 85%
rename from chrome/browser/ui/cocoa/system_hotkey_map.mm
rename to content/browser/cocoa/system_hotkey_map.mm
index 9b649fbc729ca3745f81c1c926c0123543f566db..98a27483bef96e2c14ce01e59387583593b387be 100644
--- a/chrome/browser/ui/cocoa/system_hotkey_map.mm
+++ b/content/browser/cocoa/system_hotkey_map.mm
@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/system_hotkey_map.h"
-
-#import <Cocoa/Cocoa.h>
+#import "content/browser/cocoa/system_hotkey_map.h"
 
 #pragma mark - NSDictionary Helper Functions
 
@@ -35,6 +33,8 @@ NSNumber* NumberForKey(NSDictionary* dict, NSString* key) {
 
 #pragma mark - SystemHotkey
 
+namespace content {
+
 struct SystemHotkey {
   int key_code;
   int modifiers;
@@ -47,8 +47,9 @@ SystemHotkeyMap::SystemHotkeyMap() {
 SystemHotkeyMap::~SystemHotkeyMap() {
 }
 
-bool SystemHotkeyMap::ParseData(NSData* data) {
-  system_hotkeys_.clear();
+NSDictionary* SystemHotkeyMap::DictionaryFromData(NSData* data) {
+  if (!data)
+    return nil;
 
   NSError* error = nil;
   NSPropertyListFormat format;
@@ -57,10 +58,17 @@ bool SystemHotkeyMap::ParseData(NSData* data) {
                                                 options:0
                                                  format:&format
                                                   error:&error];
-  if (error)
-    return false;
 
   if (![dictionary isKindOfClass:[NSDictionary class]])
+    return nil;
+
+  return dictionary;
+}
+
+bool SystemHotkeyMap::ParseDictionary(NSDictionary* dictionary) {
+  system_hotkeys_.clear();
+
+  if (!dictionary)
     return false;
 
   NSDictionary* hotkey_dictionaries =
@@ -103,8 +111,14 @@ bool SystemHotkeyMap::ParseData(NSData* data) {
   return true;
 }
 
-bool SystemHotkeyMap::IsHotkeyReserved(int key_code, int modifiers) {
-  std::vector<SystemHotkey>::iterator it;
+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 {
+  std::vector<SystemHotkey>::const_iterator it;

[Robert Sesek, 2014/07/14 19:37:56]

It occurs to me that doing a linear scan of this vector on every key event may
not be great. It may make sense to turn this into a std::map. Thoughts?

[erikchen, 2014/07/14 19:54:14]

When I wrote this, I deemed the minor performance hit (a linear scan of ~50
items) to be better than the minor complexity increase of using another
container. *shrug*

[Robert Sesek, 2014/07/14 19:59:45]

What do you mean another container? You could just replace the vector with a
map, right?

[erikchen, 2014/07/14 20:13:33]

Yes, I could replace the vector with a map and a comparator for SystemHotKey. Or
alternatively a multimap. But the performance characteristic for vectors is
better than maps and multimaps for small data sets because of prefetching and
caching, so its unclear if there would be any performance benefit (might even
get worse...).

If you feel strongly about this, let me know and I will write a separate CL and
change the vector to a map.

   for (it = system_hotkeys_.begin(); it != system_hotkeys_.end(); ++it) {
     if (it->key_code == key_code && it->modifiers == modifiers)
       return true;
@@ -129,3 +143,5 @@ void SystemHotkeyMap::ReserveHotkey(int key_code, int modifiers) {
   hotkey.modifiers = modifiers;
   system_hotkeys_.push_back(hotkey);
 }
+
+}  // namespace content