MacViews: Views accelerators table should match the Cocoa one.

chrome/browser/ui/views/accelerator_table.cc

 // Copyright (c) 2012 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/ui/views/accelerator_table.h"
 
 #include <stddef.h>
 
+#include <algorithm>
+#include <initializer_list>
+#include <tuple>
+
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event_constants.h"
 
 #if defined(USE_ASH)
 #include "ash/accelerators/accelerator_table.h"
 #endif
 
@@ skipping 144 matching lines @@
   // On Chrome OS, VKEY_BROWSER_SEARCH is handled in Ash.
   { ui::VKEY_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_CLEAR_BROWSING_DATA },
   { ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN, IDC_HELP_PAGE_VIA_KEYBOARD },
   { ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_HELP_PAGE_VIA_KEYBOARD },
   { ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_MANAGER },
   { ui::VKEY_BROWSER_STOP, ui::EF_NONE, IDC_STOP },
   { ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     IDC_TOUCH_HUD_PROJECTION_TOGGLE },
-#else  // !OS_MACOSX
+#else
   { ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, IDC_TASK_MANAGER },
   { ui::VKEY_DELETE, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_CLEAR_BROWSING_DATA },
   { ui::VKEY_LMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR },
   { ui::VKEY_MENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR },
   { ui::VKEY_RMENU, ui::EF_NONE, IDC_FOCUS_MENU_BAR },
   // On Windows, all VKEY_BROWSER_* keys except VKEY_BROWSER_SEARCH are handled
   // via WM_APPCOMMAND.
   { ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, IDC_FOCUS_SEARCH },
   { ui::VKEY_M, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_SHOW_AVATAR_MENU },
   // On ChromeOS, these keys are assigned to change UI scale.
   { ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS },
   { ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     IDC_ZOOM_MINUS },
   // For each entry here add an entry into kChromeCmdId2AshActionId below
   // if Ash has a corresponding accelerator.
 #if defined(GOOGLE_CHROME_BUILD)
   { ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, IDC_FEEDBACK },
 #endif
   { ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_EXIT },
   { ui::VKEY_N, ui::EF_SHIFT_DOWN | kPlatformModifier,
     IDC_NEW_INCOGNITO_WINDOW },
   { ui::VKEY_T, kPlatformModifier, IDC_NEW_TAB },
   { ui::VKEY_N, kPlatformModifier, IDC_NEW_WINDOW },
   { ui::VKEY_T, ui::EF_SHIFT_DOWN | kPlatformModifier, IDC_RESTORE_TAB },
-#endif  // !OS_CHROMEOS && !OS_MACOSX
+#endif  // !OS_CHROMEOS
 
 #if defined(OS_MACOSX)

[tapted, 2016/06/28 05:19:55]

Something weird has happened with the diff - I think it's been based on a local
branch now

   // VKEY_OEM_4 is Left Brace '[{' key.
   { ui::VKEY_OEM_4, ui::EF_COMMAND_DOWN, IDC_BACK },
   { ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN, IDC_BASIC_PRINT },
   { ui::VKEY_BACK, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
     IDC_CLEAR_BROWSING_DATA },
   { ui::VKEY_C, ui::EF_COMMAND_DOWN, IDC_CONTENT_CONTEXT_COPY },
   { ui::VKEY_X, ui::EF_COMMAND_DOWN, IDC_CONTENT_CONTEXT_CUT },
   { ui::VKEY_V, ui::EF_COMMAND_DOWN, IDC_CONTENT_CONTEXT_PASTE },
   { ui::VKEY_V, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
     IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE },
@@ skipping 56 matching lines @@
 #endif // defined(USE_ASH)
 
 } // namespace
 
 std::vector<AcceleratorMapping> GetAcceleratorList() {
   CR_DEFINE_STATIC_LOCAL(std::vector<AcceleratorMapping>, accelerators, ());
   if (accelerators.empty()) {
     accelerators.insert(accelerators.begin(), std::begin(kAcceleratorMap),
                         std::end(kAcceleratorMap));
 #if defined(OS_MACOSX)
+#if 1
     // Alt, Control, Shift without Command and accelerators without modifiers
     // are not very typical for native Mac apps. Simplify the kAcceleratorMap
     // table by filtering them out.
-    auto it = std::remove_if(accelerators.begin(), accelerators.end(),
-                             [](const AcceleratorMapping& m) {
+    std::vector<AcceleratorMapping> accelerators_mblsha = accelerators;
+    auto remove_start_mblsha = std::remove_if(accelerators_mblsha.begin(),
+                                              accelerators_mblsha.end(),
+                                              [](const AcceleratorMapping& m) {
       if (m.modifiers & ui::EF_COMMAND_DOWN) {
         // Command is Mac-specific, so this accelerator should be enabled.
         return false;
       }
       return m.modifiers == ui::EF_NONE ||
              m.modifiers == ui::EF_SHIFT_DOWN ||
              m.modifiers == (ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN) ||
              m.modifiers & ui::EF_ALT_DOWN ||
              m.modifiers & ui::EF_CONTROL_DOWN;
     });
-    accelerators.erase(it, accelerators.end());
+    accelerators_mblsha.erase(remove_start_mblsha, accelerators_mblsha.end());
+#endif
+
+    // Alt by itself (or with just shift) is never used on Mac since it's used
+    // to generate non-ASCII characters. Such commands are given Mac-specific
+    // bindings as well, so remove the mappings with Alt, but not those with
+    // Command or Control.
+    const int kMask =
+        ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN;
+    auto remove_start = std::remove_if(accelerators.begin(), accelerators.end(),
+                                       [](const AcceleratorMapping& m) {
+      return (m.modifiers & kMask) == ui::EF_ALT_DOWN;
+    });
+
+#if DCHECK_IS_ON()
+    // For everything being removed, ensure there's another mapping.
+    for (auto it = remove_start; it != accelerators.end(); ++it) {
+      auto found = std::find_if(accelerators.begin(), remove_start,
+                                [&it](const AcceleratorMapping& m) {
+        return m.command_id == it->command_id;
+      });
+      DCHECK(found != accelerators.end());
+    }
+#endif
+    accelerators.erase(remove_start, accelerators.end());
+
+#if 1
+    VLOG(1) << "accelerators";
+    for (auto d : accelerators) {
+      VLOG(1) << d.command_id << " modifiers:"
+              << (d.modifiers & ui::EF_COMMAND_DOWN ? "(Cmd)" : "")
+              << (d.modifiers & ui::EF_CONTROL_DOWN ? "(Ctrl)" : "")
+              << (d.modifiers & ui::EF_ALT_DOWN ? "(Alt)" : "")
+              << (d.modifiers & ui::EF_SHIFT_DOWN ? "(Shift)" : "")
+              << "; keycode:" << d.keycode;
+    }
+
+    VLOG(1) << "\n\n\naccelerators_mblsha";
+    for (auto d : accelerators_mblsha) {
+      VLOG(1) << d.command_id << " modifiers:"
+              << (d.modifiers & ui::EF_COMMAND_DOWN ? "(Cmd)" : "")
+              << (d.modifiers & ui::EF_CONTROL_DOWN ? "(Ctrl)" : "")
+              << (d.modifiers & ui::EF_ALT_DOWN ? "(Alt)" : "")
+              << (d.modifiers & ui::EF_SHIFT_DOWN ? "(Shift)" : "")
+              << "; keycode:" << d.keycode;
+    }
+#endif
 #endif  // OS_MACOSX
   }
   return accelerators;
 }
 
 bool GetAshAcceleratorForCommandId(int command_id,
                                    ui::Accelerator* accelerator) {
 #if defined(USE_ASH)
   for (size_t i = 0; i < kChromeCmdId2AshActionIdLength; ++i) {
     if (command_id == kChromeCmdId2AshActionId[i].chrome_cmd_id) {
@@ skipping 23 matching lines @@
       *accelerator = ui::Accelerator(ui::VKEY_C, kPlatformModifier);
       return true;
     case IDC_PASTE:
       *accelerator = ui::Accelerator(ui::VKEY_V, kPlatformModifier);
       return true;
   }
   return false;
 }
 
 }  // namespace chrome