[mac] Fix Cmd-w in the one-tab case.

chrome/browser/cocoa/browser_window_cocoa.mm

 // Copyright (c) 2009 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/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"
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
 #import "chrome/browser/cocoa/download_shelf_controller.h"
 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h"
 #import "chrome/browser/cocoa/nsmenuitem_additions.h"
 #include "chrome/browser/cocoa/page_info_window_mac.h"
 #include "chrome/browser/cocoa/status_bubble_mac.h"
 #include "chrome/browser/cocoa/task_manager_mac.h"
@@ skipping 339 matching lines @@
   if ([event.os_event type] != NSKeyDown)
     return -1;
 
   // Look in menu.
   NSMenuItem* item = [MenuWalker itemForKeyEquivalent:event.os_event
                                                  menu:[NSApp mainMenu]];
 
   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;
   const bool shiftKey = (modifiers & NSShiftKeyMask) != 0;
   const bool cntrlKey = (modifiers & NSControlKeyMask) != 0;
   const bool optKey = (modifiers & NSAlternateKeyMask) != 0;
   const int keyCode = [event.os_event keyCode];
 
   int cmdNum = CommandForWindowKeyboardShortcut(
       cmdKey, shiftKey, cntrlKey, optKey, keyCode);
@@ skipping 22 matching lines @@
       break;
   }
 }
 
 void BrowserWindowCocoa::DestroyBrowser() {
   [controller_ destroyBrowser];
 
   // at this point the controller is dead (autoreleased), so
   // make sure we don't try to reference it any more.
 }