MacViews: Views accelerators table should match the Cocoa one.

chrome/browser/global_keyboard_shortcuts_mac.mm

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 34 matching lines @@
 
 const KeyboardShortcutData* GetWindowKeyboardShortcutTable(
     size_t* num_entries) {
   static const KeyboardShortcutData keyboard_shortcuts[] = {
       // cmd   shift  cntrl  option
       // ---   -----  -----  ------
       // '{' / '}' characters should be matched earlier than virtual key code
       // (therefore we can match alt-8 as '{' on german keyboards).
       {true, false, false, false, 0, '}', IDC_SELECT_NEXT_TAB},
       {true, false, false, false, 0, '{', IDC_SELECT_PREVIOUS_TAB},
-      {false, false, true, false, kVK_PageDown, 0, IDC_SELECT_NEXT_TAB},
-      {false, false, true, false, kVK_Tab, 0, IDC_SELECT_NEXT_TAB},
-      {false, false, true, false, kVK_PageUp, 0, IDC_SELECT_PREVIOUS_TAB},
-      {false, true, true, false, kVK_Tab, 0, IDC_SELECT_PREVIOUS_TAB},
+      // {false, false, true, false, kVK_PageDown, 0, IDC_SELECT_NEXT_TAB},

[tapted, 2016/10/17 07:02:47]

If removing these makes sense for the regular Chrome Cocoa browser, then we need
a separate CL for that.

[themblsha, 2016/10/20 16:41:05]

These tables are still required for Cocoa browser. Created a separate one to
handle Cmd+Shift+CurlyBraces.

I want to make the standard tables unusable on non-MacViews builds. What's the
best way to ensure that?

+      // {false, false, true, false, kVK_Tab, 0, IDC_SELECT_NEXT_TAB},
+      // {false, false, true, false, kVK_PageUp, 0, IDC_SELECT_PREVIOUS_TAB},
+      // {false, true, true, false, kVK_Tab, 0, IDC_SELECT_PREVIOUS_TAB},
       // Cmd-0..8 select the Nth tab, with cmd-9 being "last tab".
-      {true, false, false, false, kVK_ANSI_1, 0, IDC_SELECT_TAB_0},
-      {true, false, false, false, kVK_ANSI_Keypad1, 0, IDC_SELECT_TAB_0},
-      {true, false, false, false, kVK_ANSI_2, 0, IDC_SELECT_TAB_1},
-      {true, false, false, false, kVK_ANSI_Keypad2, 0, IDC_SELECT_TAB_1},
-      {true, false, false, false, kVK_ANSI_3, 0, IDC_SELECT_TAB_2},
-      {true, false, false, false, kVK_ANSI_Keypad3, 0, IDC_SELECT_TAB_2},
-      {true, false, false, false, kVK_ANSI_4, 0, IDC_SELECT_TAB_3},
-      {true, false, false, false, kVK_ANSI_Keypad4, 0, IDC_SELECT_TAB_3},
-      {true, false, false, false, kVK_ANSI_5, 0, IDC_SELECT_TAB_4},
-      {true, false, false, false, kVK_ANSI_Keypad5, 0, IDC_SELECT_TAB_4},
-      {true, false, false, false, kVK_ANSI_6, 0, IDC_SELECT_TAB_5},
-      {true, false, false, false, kVK_ANSI_Keypad6, 0, IDC_SELECT_TAB_5},
-      {true, false, false, false, kVK_ANSI_7, 0, IDC_SELECT_TAB_6},
-      {true, false, false, false, kVK_ANSI_Keypad7, 0, IDC_SELECT_TAB_6},
-      {true, false, false, false, kVK_ANSI_8, 0, IDC_SELECT_TAB_7},
-      {true, false, false, false, kVK_ANSI_Keypad8, 0, IDC_SELECT_TAB_7},
-      {true, false, false, false, kVK_ANSI_9, 0, IDC_SELECT_LAST_TAB},
-      {true, false, false, false, kVK_ANSI_Keypad9, 0, IDC_SELECT_LAST_TAB},
-      {true, true, false, false, kVK_ANSI_M, 0, IDC_SHOW_AVATAR_MENU},
-      {true, false, false, true, kVK_ANSI_L, 0, IDC_SHOW_DOWNLOADS},
+      // {true, false, false, false, kVK_ANSI_1, 0, IDC_SELECT_TAB_0},
+      // {true, false, false, false, kVK_ANSI_Keypad1, 0, IDC_SELECT_TAB_0},
+      // {true, false, false, false, kVK_ANSI_2, 0, IDC_SELECT_TAB_1},
+      // {true, false, false, false, kVK_ANSI_Keypad2, 0, IDC_SELECT_TAB_1},
+      // {true, false, false, false, kVK_ANSI_3, 0, IDC_SELECT_TAB_2},
+      // {true, false, false, false, kVK_ANSI_Keypad3, 0, IDC_SELECT_TAB_2},
+      // {true, false, false, false, kVK_ANSI_4, 0, IDC_SELECT_TAB_3},
+      // {true, false, false, false, kVK_ANSI_Keypad4, 0, IDC_SELECT_TAB_3},
+      // {true, false, false, false, kVK_ANSI_5, 0, IDC_SELECT_TAB_4},
+      // {true, false, false, false, kVK_ANSI_Keypad5, 0, IDC_SELECT_TAB_4},
+      // {true, false, false, false, kVK_ANSI_6, 0, IDC_SELECT_TAB_5},
+      // {true, false, false, false, kVK_ANSI_Keypad6, 0, IDC_SELECT_TAB_5},
+      // {true, false, false, false, kVK_ANSI_7, 0, IDC_SELECT_TAB_6},
+      // {true, false, false, false, kVK_ANSI_Keypad7, 0, IDC_SELECT_TAB_6},
+      // {true, false, false, false, kVK_ANSI_8, 0, IDC_SELECT_TAB_7},
+      // {true, false, false, false, kVK_ANSI_Keypad8, 0, IDC_SELECT_TAB_7},
+      // {true, false, false, false, kVK_ANSI_9, 0, IDC_SELECT_LAST_TAB},
+      // {true, false, false, false, kVK_ANSI_Keypad9, 0, IDC_SELECT_LAST_TAB},
+      // {true, true, false, false, kVK_ANSI_M, 0, IDC_SHOW_AVATAR_MENU},
+
+      // FIXME(mblsha): Hmm, I can't trigger downloads in Cocoa version on

[tapted, 2016/10/17 07:02:47]

do you mean it doesn't work in the Chrome Canary? It works for me - Cmd+Alt+l
opens a chrome://downloads tab. But it's possible Chrome does the wrong thing
for non-US keyboard layouts.

[themblsha, 2016/10/20 16:41:05]

Whoops, weren't testing on the Canary. Added it to accelerators_table.cc.
Thanks!

+      // Cmd+Opt+L
+      // {true, false, false, true, kVK_ANSI_L, 0, IDC_SHOW_DOWNLOADS},
   };
 
   *num_entries = arraysize(keyboard_shortcuts);
 
   return keyboard_shortcuts;
 }
 
 const KeyboardShortcutData* GetDelayedWindowKeyboardShortcutTable(
     size_t* num_entries) {
   static const KeyboardShortcutData keyboard_shortcuts[] = {
     //cmd   shift  cntrl  option
     //---   -----  -----  ------
-    {false, false, false, false, kVK_Escape,        0, IDC_STOP},
+    // {false, false, false, false, kVK_Escape,        0, IDC_STOP},
   };
 
-  *num_entries = arraysize(keyboard_shortcuts);
+  // *num_entries = arraysize(keyboard_shortcuts);
+  *num_entries = 0;
 
   return keyboard_shortcuts;
 }
 
 const KeyboardShortcutData* GetBrowserKeyboardShortcutTable(
     size_t* num_entries) {
   static const KeyboardShortcutData keyboard_shortcuts[] = {
     //cmd   shift  cntrl  option
     //---   -----  -----  ------
-    {true,  false, false, false, kVK_LeftArrow,    0,   IDC_BACK},
-    {true,  false, false, false, kVK_RightArrow,   0,   IDC_FORWARD},
-    {false, false, false, false, kVK_Delete,       0,   IDC_BACKSPACE_BACK},
-    {false, true,  false, false, kVK_Delete,       0,   IDC_BACKSPACE_FORWARD},
-    {true,  true,  false, false, 0,                'c', IDC_DEV_TOOLS_INSPECT},
+    // {true,  false, false, false, kVK_LeftArrow,    0,   IDC_BACK},
+    // {true,  false, false, false, kVK_RightArrow,   0,   IDC_FORWARD},
+    // {false, false, false, false, kVK_Delete,       0,   IDC_BACKSPACE_BACK},
+    // {false, true,  false, false, kVK_Delete,       0,   IDC_BACKSPACE_FORWARD},
+    // {true,  true,  false, false, 0,                'c', IDC_DEV_TOOLS_INSPECT},
   };
 
-  *num_entries = arraysize(keyboard_shortcuts);
+  // *num_entries = arraysize(keyboard_shortcuts);
+  *num_entries = 0;
 
   return keyboard_shortcuts;
 }
 
 static bool MatchesEventForKeyboardShortcut(
     const KeyboardShortcutData& shortcut,
     bool command_key, bool shift_key, bool cntrl_key, bool opt_key,
     int vkey_code, unichar key_char) {
   // Expects that one of |key_char| or |vkey_code| is 0.
   DCHECK((shortcut.key_char == 0) ^ (shortcut.vkey_code == 0));
@@ skipping 171 matching lines @@
       }
     }
 
     // opt/alt modifier is set (e.g. on german layout we want '{' for opt-8).
     if ([event modifierFlags] & NSAlternateKeyMask)
       return rawChar;
   }
 
   return noModifiersChar;
 }