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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/global_keyboard_shortcuts_cocoa_mac.mm

Issue 2696353003: Clean up the Mac shortcut tables, and make them clang-format proof. (Closed)
Patch Set: Created 3 years, 10 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/global_keyboard_shortcuts_views_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/global_keyboard_shortcuts_cocoa_mac.mm
diff --git a/chrome/browser/global_keyboard_shortcuts_cocoa_mac.mm b/chrome/browser/global_keyboard_shortcuts_cocoa_mac.mm
index b92ff44c313d09fbe2f81767d492adb5a3a980a1..88543bc4e3a61b91117c70e6fd0e4a9dae9838c6 100644
--- a/chrome/browser/global_keyboard_shortcuts_cocoa_mac.mm
+++ b/chrome/browser/global_keyboard_shortcuts_cocoa_mac.mm
@@ -15,61 +15,70 @@
// (DelayedWindowKeyboardShortcut).
const std::vector<KeyboardShortcutData>& GetWindowKeyboardShortcutTable() {
+ // clang-format off
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},
- {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},
- // 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},
+ //cmd shift cntrl option vkeycode char command
+ //--- ----- ----- ------ -------- ---- -------
+ // '{' / '}' characters should be matched earlier than virtual key codes
+ // (so 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},
+
+ //cmd shift cntrl option vkeycode char command
+ //--- ----- ----- ------ -------- ---- -------
+ // 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},
}));
+ // clang-format on
return result;
}
const std::vector<KeyboardShortcutData>&
GetDelayedWindowKeyboardShortcutTable() {
+ // clang-format off
CR_DEFINE_STATIC_LOCAL(std::vector<KeyboardShortcutData>, result, ({
- //cmd shift cntrl option
- //--- ----- ----- ------
- {false, false, false, false, kVK_Escape, 0, IDC_STOP},
+ //cmd shift cntrl option vkeycode char command
+ //--- ----- ----- ------ -------- ---- -------
+ {false, false, false, false, kVK_Escape, 0, IDC_STOP},
}));
+ // clang-format on
return result;
}
const std::vector<KeyboardShortcutData>& GetBrowserKeyboardShortcutTable() {
+ // clang-format off
CR_DEFINE_STATIC_LOCAL(std::vector<KeyboardShortcutData>, result, ({
- //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},
+ //cmd shift cntrl option vkeycode char command
+ //--- ----- ----- ------ -------- ---- -------
+ {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},
}));
+ // clang-format on
return result;
}
« no previous file with comments | « no previous file | chrome/browser/global_keyboard_shortcuts_views_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698