MacViews: Views accelerators table should match the Cocoa one.

chrome/browser/global_keyboard_shortcuts_views_mac.mm

+// Copyright 2016 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 "base/macros.h"
+#include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/global_keyboard_shortcuts_mac.h"

[sky, 2016/11/08 18:34:09]

this should be the first include.

[themblsha, 2016/11/09 14:54:02]

This results in a warning, because the include file name doesn't match the .mm:

Your #include order seems to be broken. Remember to use the right collation
(LC_COLLATE=C) and check
https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes
      chrome/browser/global_keyboard_shortcuts_cocoa_mac.mm:7: - line belongs
before previous line \

OK, I ignored the warning.

[Peter Kasting, 2016/11/09 18:39:12]

In this case, I think your previous ordering was right, since there is no
_views_mac.h.  (Or in other words, I think the warning is correct.)

[themblsha, 2016/11/10 14:18:05]

Ok, restored the includes :-)

+
+// Lists shortcuts that are impossible to migrate to accelerator_table.cc
+// (crbug.com/25946).
+
+const std::vector<KeyboardShortcutData>& GetWindowKeyboardShortcutTable() {
+  CR_DEFINE_STATIC_LOCAL(std::vector<KeyboardShortcutData>, result, ({
+      // 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},
+  }));
+  return result;
+}
+
+const std::vector<KeyboardShortcutData>&
+GetDelayedWindowKeyboardShortcutTable() {
+  CR_DEFINE_STATIC_LOCAL(std::vector<KeyboardShortcutData>, result, ({}));
+  return result;
+}
+
+const std::vector<KeyboardShortcutData>& GetBrowserKeyboardShortcutTable() {
+  CR_DEFINE_STATIC_LOCAL(std::vector<KeyboardShortcutData>, result, ({}));
+  return result;
+}