Make cmd-{/} shortcut keys work on any keyboard layouts on Mac

chrome/browser/global_keyboard_shortcuts_mac_unittest.mm

Index: chrome/browser/global_keyboard_shortcuts_mac_unittest.mm
diff --git a/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm b/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm
index f2a88ac30822149abb2b5853320269f609beb9ef..36ab6187a9439a88985197112bfde8ef96d27d08 100644
--- a/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm
+++ b/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm
@@ -2,16 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <AppKit/NSEvent.h>
 #include <Carbon/Carbon.h>
 
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 
+#include "chrome/app/chrome_dll_resource.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(GlobalKeyboardShortcuts, ShortcutsToWindowCommand) {
   // Test that an invalid shortcut translates into an invalid command id.
   ASSERT_EQ(
-      -1, CommandForWindowKeyboardShortcut(false, false, false, false, 0));
+      -1, CommandForWindowKeyboardShortcut(false, false, false, false, 0, 0));
 
   // Check that all known keyboard shortcuts return valid results.
   size_t num_shortcuts = 0;
@@ -21,7 +23,7 @@ TEST(GlobalKeyboardShortcuts, ShortcutsToWindowCommand) {
   for (size_t i = 0; i < num_shortcuts; ++i, ++it) {
     int cmd_num = CommandForWindowKeyboardShortcut(
         it->command_key, it->shift_key, it->cntrl_key, it->opt_key,
-        it->vkey_code);
+        it->vkey_code, it->key_char);
     ASSERT_EQ(cmd_num, it->chrome_command);
   }
 
@@ -29,15 +31,27 @@ TEST(GlobalKeyboardShortcuts, ShortcutsToWindowCommand) {
   // would be invoked even if e.g. the omnibox had focus, where they really
   // should have text editing functionality).
   ASSERT_EQ(-1, CommandForWindowKeyboardShortcut(
-      true, false, false, false, kVK_LeftArrow));
+      true, false, false, false, kVK_LeftArrow, 0));
   ASSERT_EQ(-1, CommandForWindowKeyboardShortcut(
-      false, false, false, false, kVK_Delete));
+      false, false, false, false, kVK_Delete, 0));
+
+  // Test that Cmd-'{' and Cmd-'}' are interpreted as IDC_SELECT_NEXT_TAB
+  // and IDC_SELECT_PREVIOUS_TAB regardless of the virtual key code values.
+  ASSERT_EQ(IDC_SELECT_NEXT_TAB, CommandForWindowKeyboardShortcut(
+      true, false, false, false, kVK_ANSI_Period, '}'));
+  ASSERT_EQ(IDC_SELECT_PREVIOUS_TAB, CommandForWindowKeyboardShortcut(
+      true, true, false, false, kVK_ANSI_Slash, '{'));
+
+  // One more test for Cmd-'{' / Alt-8 (on german keyboard layout).
+  ASSERT_EQ(IDC_SELECT_PREVIOUS_TAB, CommandForWindowKeyboardShortcut(
+      true, false, false, true, kVK_ANSI_8, '{'));
 }
 
 TEST(GlobalKeyboardShortcuts, ShortcutsToDelayedWindowCommand) {
   // Test that an invalid shortcut translates into an invalid command id.
   ASSERT_EQ(-1,
-      CommandForDelayedWindowKeyboardShortcut(false, false, false, false, 0));
+      CommandForDelayedWindowKeyboardShortcut(false, false, false, false,
+                                              0, 0));
 
   // Check that all known keyboard shortcuts return valid results.
   size_t num_shortcuts = 0;
@@ -47,7 +61,7 @@ TEST(GlobalKeyboardShortcuts, ShortcutsToDelayedWindowCommand) {
   for (size_t i = 0; i < num_shortcuts; ++i, ++it) {
     int cmd_num = CommandForDelayedWindowKeyboardShortcut(
         it->command_key, it->shift_key, it->cntrl_key, it->opt_key,
-        it->vkey_code);
+        it->vkey_code, it->key_char);
     ASSERT_EQ(cmd_num, it->chrome_command);
   }
 }
@@ -55,7 +69,8 @@ TEST(GlobalKeyboardShortcuts, ShortcutsToDelayedWindowCommand) {
 TEST(GlobalKeyboardShortcuts, ShortcutsToBrowserCommand) {
   // Test that an invalid shortcut translates into an invalid command id.
   ASSERT_EQ(
-      -1, CommandForBrowserKeyboardShortcut(false, false, false, false, 0));
+      -1, CommandForBrowserKeyboardShortcut(false, false, false, false,
+                                            0, 0));
 
   // Check that all known keyboard shortcuts return valid results.
   size_t num_shortcuts = 0;
@@ -65,6 +80,55 @@ TEST(GlobalKeyboardShortcuts, ShortcutsToBrowserCommand) {
   for (size_t i = 0; i < num_shortcuts; ++i, ++it) {
     int cmd_num = CommandForBrowserKeyboardShortcut(
         it->command_key, it->shift_key, it->cntrl_key, it->opt_key,
-        it->vkey_code);    ASSERT_EQ(cmd_num, it->chrome_command);
+        it->vkey_code, it->key_char);
+    ASSERT_EQ(cmd_num, it->chrome_command);
   }
 }
+
+NSEvent* KeyEvent(bool command_key, bool shift_key,
+                  bool cntrl_key, bool opt_key,
+                  NSString* chars, NSString* charsNoMods) {
+  NSUInteger modifierFlags = 0;
+  if (command_key)
+    modifierFlags |= NSCommandKeyMask;
+  if (shift_key)
+    modifierFlags |= NSShiftKeyMask;
+  if (cntrl_key)
+    modifierFlags |= NSControlKeyMask;
+  if (opt_key)
+    modifierFlags |= NSAlternateKeyMask;
+  return [NSEvent keyEventWithType:NSKeyDown
+                          location:NSZeroPoint
+                     modifierFlags:modifierFlags
+                         timestamp:0.0
+                      windowNumber:0
+                           context:nil
+                        characters:chars
+       charactersIgnoringModifiers:charsNoMods
+                         isARepeat:NO
+                           keyCode:0];
+}
+
+TEST(GlobalKeyboardShortcuts, KeyCharacterForEvent) {
+  // 'a'
+  ASSERT_EQ('a', KeyCharacterForEvent(
+      KeyEvent(false, false, false, false, @"a", @"a")));
+  // cmd-'a' / cmd-shift-'a'
+  ASSERT_EQ('a', KeyCharacterForEvent(
+      KeyEvent(true,  true,  false, false, @"a", @"A")));
+  // '8'
+  ASSERT_EQ('8', KeyCharacterForEvent(
+      KeyEvent(false, false, false, false, @"8", @"8")));
+  // '{' / alt-'8' on german
+  ASSERT_EQ('{', KeyCharacterForEvent(
+      KeyEvent(false, false, false, true,  @"{", @"8")));
+  // cmd-'{' / cmd-shift-'[' on ansi
+  ASSERT_EQ('{', KeyCharacterForEvent(
+      KeyEvent(true,  true,  false, false, @"[", @"{")));
+  // cmd-'z' / cmd-shift-';' on dvorak-qwerty
+  ASSERT_EQ('z', KeyCharacterForEvent(
+      KeyEvent(true,  true,  false, false, @"z", @":")));
+  // Test if getting dead-key events return 0 and do not hang.
+  ASSERT_EQ(0,   KeyCharacterForEvent(
+      KeyEvent(false, false, false, false, @"",  @"")));
+}