Revert "mac: Load the system hotkeys after launch."

chrome/browser/ui/cocoa/system_hotkey_map.mm

Index: chrome/browser/ui/cocoa/system_hotkey_map.mm
diff --git a/content/browser/cocoa/system_hotkey_map.mm b/chrome/browser/ui/cocoa/system_hotkey_map.mm
similarity index 85%
rename from content/browser/cocoa/system_hotkey_map.mm
rename to chrome/browser/ui/cocoa/system_hotkey_map.mm
index 98a27483bef96e2c14ce01e59387583593b387be..9b649fbc729ca3745f81c1c926c0123543f566db 100644
--- a/content/browser/cocoa/system_hotkey_map.mm
+++ b/chrome/browser/ui/cocoa/system_hotkey_map.mm
@@ -2,7 +2,9 @@
 // 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 "chrome/browser/ui/cocoa/system_hotkey_map.h"
+
+#import <Cocoa/Cocoa.h>
 
 #pragma mark - NSDictionary Helper Functions
 
@@ -33,8 +35,6 @@ NSNumber* NumberForKey(NSDictionary* dict, NSString* key) {
 
 #pragma mark - SystemHotkey
 
-namespace content {
-
 struct SystemHotkey {
   int key_code;
   int modifiers;
@@ -47,9 +47,8 @@ SystemHotkeyMap::SystemHotkeyMap() {
 SystemHotkeyMap::~SystemHotkeyMap() {
 }
 
-NSDictionary* SystemHotkeyMap::DictionaryFromData(NSData* data) {
-  if (!data)
-    return nil;
+bool SystemHotkeyMap::ParseData(NSData* data) {
+  system_hotkeys_.clear();
 
   NSError* error = nil;
   NSPropertyListFormat format;
@@ -58,17 +57,10 @@ NSDictionary* SystemHotkeyMap::DictionaryFromData(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 =
@@ -111,14 +103,8 @@ bool SystemHotkeyMap::ParseDictionary(NSDictionary* dictionary) {
   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 {
-  std::vector<SystemHotkey>::const_iterator it;
+bool SystemHotkeyMap::IsHotkeyReserved(int key_code, int modifiers) {
+  std::vector<SystemHotkey>::iterator it;
   for (it = system_hotkeys_.begin(); it != system_hotkeys_.end(); ++it) {
     if (it->key_code == key_code && it->modifiers == modifiers)
       return true;
@@ -143,5 +129,3 @@ void SystemHotkeyMap::ReserveHotkey(int key_code, int modifiers) {
   hotkey.modifiers = modifiers;
   system_hotkeys_.push_back(hotkey);
 }
-
-}  // namespace content