diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 17:07:06 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 17:07:06 +0000 |
| commit | ceda1872370a8d99d4f03cbc6b297088b192f14d (patch) | |
| tree | 27b2c66c3eff6bbe65bd4b416557717304d63154 /chrome/browser/cocoa/browser_window_cocoa.mm | |
| parent | 5fe7264ca7191fc87bb532708c7e9dba8d5feb3c (diff) | |
| download | chromium_src-ceda1872370a8d99d4f03cbc6b297088b192f14d.zip chromium_src-ceda1872370a8d99d4f03cbc6b297088b192f14d.tar.gz chromium_src-ceda1872370a8d99d4f03cbc6b297088b192f14d.tar.bz2 | |
[mac] Fix Cmd-w in the one-tab case.
BUG=25788
TEST=See bug
Review URL: http://codereview.chromium.org/337040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_cocoa.mm')
| -rw-r--r-- | chrome/browser/cocoa/browser_window_cocoa.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index 25cd638..f48746e 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -5,6 +5,7 @@ #include "base/gfx/rect.h" #include "base/logging.h" #include "base/sys_string_conversions.h" +#include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/cocoa/browser_window_cocoa.h" #import "chrome/browser/cocoa/browser_window_controller.h" @@ -364,6 +365,12 @@ int BrowserWindowCocoa::GetCommandId(const NativeWebKeyboardEvent& event) { if (item && [item action] == @selector(commandDispatch:) && [item tag] > 0) return [item tag]; + // "Close window" doesn't use the |commandDispatch:| mechanism. Menu items + // that do not correspond to IDC_ constants need no special treatment however, + // as they can't be blacklisted in |Browser::IsReservedAccelerator()| anyhow. + if (item && [item action] == @selector(performClose:)) + return IDC_CLOSE_WINDOW; + // Look in secondary keyboard shortcuts. NSUInteger modifiers = [event.os_event modifierFlags]; const bool cmdKey = (modifiers & NSCommandKeyMask) != 0; |