| Index: chrome/browser/tab_contents/tab_contents_view_mac.mm
|
| diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm
|
| index 908b41127435413bc16c5786f8bf6ccf743b5d2f..90e66721d0d3a799e78a9cab84bdf099a58363d2 100644
|
| --- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
|
| +++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
|
| @@ -333,6 +333,14 @@ void TabContentsViewMac::Observe(NotificationType type,
|
|
|
| // Do not fire shortcuts on key up.
|
| if ([event type] == NSKeyDown) {
|
| + // Send the event to the menu before sending it to the browser/window
|
| + // shortcut handling, so that if a user configures cmd-left to mean
|
| + // "previous tab", it takes precedence over the built-in "history back"
|
| + // binding. Other than that, the |redispatchEvent| call would take care of
|
| + // invoking the original menu item shortcut as well.
|
| + if ([[NSApp mainMenu] performKeyEquivalent:event])
|
| + return;
|
| +
|
| if ([window handleExtraBrowserKeyboardShortcut:event])
|
| return;
|
| if ([window handleExtraWindowKeyboardShortcut:event])
|
|
|