MacViews: Fix GlobalKeyboardShortcuts.ShortcutsToWindowCommand.

chrome/browser/global_keyboard_shortcuts_mac.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_GLOBAL_KEYBOARD_SHORTCUTS_MAC_H_
 #define CHROME_BROWSER_GLOBAL_KEYBOARD_SHORTCUTS_MAC_H_
 
 #include <Carbon/Carbon.h>  // For unichar.
 #include <stddef.h>
 
@@ skipping 27 matching lines @@
 // this. Hence, we need three types of keyboard shortcuts: shortcuts that are
 // intercepted before the Omnibox handles events, shortcuts that are
 // intercepted after the Omnibox had a chance but did not handle them, and
 // shortcuts that are only handled when tab contents is focused.
 //
 // This means cmd-left doesn't work if you hit cmd-l tab, which focusses
 // something that's neither omnibox nor tab contents. This behavior is
 // consistent with safari and camino, and I think it's the best we can do
 // without rewriting event dispatching ( http://crbug.com/251069 ).
 
+// Generic function used by CommandForWindowKeyboardShortcut,
+// CommandForDelayedWindowKeyboardShortcut and
+// CommandForBrowserKeyboardShortcut.
+int CommandForKeyboardShortcut(const std::vector<KeyboardShortcutData>& table,
+                               bool command_key,
+                               bool shift_key,
+                               bool cntrl_key,
+                               bool opt_key,
+                               int vkey_code,
+                               unichar key_char);
+
 // This returns shortcuts that should work no matter what component of the
 // browser is focused. They are executed by the window, before any view has the
 // opportunity to override the shortcut (with the exception of the tab contents,
 // which first checks if the current web page wants to handle the shortcut).
 int CommandForWindowKeyboardShortcut(
     bool command_key, bool shift_key, bool cntrl_key, bool opt_key,
     int vkey_code, unichar key_char);
 
 // This returns shortcuts that should work no matter what component of the
 // browser is focused. They are executed by the window, after any view has the
@@ skipping 21 matching lines @@
 // layout we want '{' character rather than '8' for opt-8.)
 unichar KeyCharacterForEvent(NSEvent* event);
 
 // For testing purposes.
 const std::vector<KeyboardShortcutData>& GetWindowKeyboardShortcutTable();
 const std::vector<KeyboardShortcutData>&
 GetDelayedWindowKeyboardShortcutTable();
 const std::vector<KeyboardShortcutData>& GetBrowserKeyboardShortcutTable();
 
 #endif  // #ifndef CHROME_BROWSER_GLOBAL_KEYBOARD_SHORTCUTS_MAC_H_