Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2203)

Unified Diff: chrome/browser/global_keyboard_shortcuts_views_mac.mm

Issue 2074643003: MacViews: Views accelerators table should match the Cocoa one. (Closed) Base URL: ssh://bitbucket.browser.yandex-team.ru/chromium/src.git@master
Patch Set: Fix compilation. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/global_keyboard_shortcuts_views_mac.mm
diff --git a/chrome/browser/global_keyboard_shortcuts_views_mac.mm b/chrome/browser/global_keyboard_shortcuts_views_mac.mm
new file mode 100644
index 0000000000000000000000000000000000000000..663b02f98b65649e3957b155805095b349002158
--- /dev/null
+++ b/chrome/browser/global_keyboard_shortcuts_views_mac.mm
@@ -0,0 +1,33 @@
+// 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"
+
+// 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;
+}
« no previous file with comments | « chrome/browser/global_keyboard_shortcuts_mac_unittest.mm ('k') | chrome/browser/ui/views/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698