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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/global_keyboard_shortcuts_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: Updated accelerator_table.cc, removed non-Cocoa shortcuts, added global_keyboard_shortcuts_mac.mm h… Created 4 years, 2 months 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
« no previous file with comments | « no previous file | chrome/browser/ui/BUILD.gn » ('j') | chrome/browser/ui/views/accelerator_table.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/global_keyboard_shortcuts_mac.mm
diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm
index e197c07c39cfc23ce95fb2536f0edefb821ce2c2..b6bc7bb3c2b06067be58255cb5255cdf589a41bf 100644
--- a/chrome/browser/global_keyboard_shortcuts_mac.mm
+++ b/chrome/browser/global_keyboard_shortcuts_mac.mm
@@ -52,31 +52,34 @@ const KeyboardShortcutData* GetWindowKeyboardShortcutTable(
// (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 Chro
themblsha 2016/10/20 16:41:05 These tables are still required for Cocoa browser.
+ // {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?
themblsha 2016/10/20 16:41:05 Whoops, weren't testing on the Canary. Added it to
+ // Cmd+Opt+L
+ // {true, false, false, true, kVK_ANSI_L, 0, IDC_SHOW_DOWNLOADS},
};
*num_entries = arraysize(keyboard_shortcuts);
@@ -89,10 +92,11 @@ const KeyboardShortcutData* GetDelayedWindowKeyboardShortcutTable(
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;
}
@@ -102,14 +106,15 @@ const KeyboardShortcutData* GetBrowserKeyboardShortcutTable(
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;
}
« no previous file with comments | « no previous file | chrome/browser/ui/BUILD.gn » ('j') | chrome/browser/ui/views/accelerator_table.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698