Explicitly use Cmd+w for "Close Window" in apps. (Mac)

chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm

 // Copyright 2013 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.
 
 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h"
 
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 219 matching lines @@
   [appMenu addItem:[hideDoppelganger_ menuItem]];
   [appMenu addItem:[NSMenuItem separatorItem]];
   [appMenu addItem:[quitDoppelganger_ menuItem]];
 
   // File menu.
   fileMenuItem_.reset([NewTopLevelItemFrom(IDC_FILE_MENU) retain]);
   [[fileMenuItem_ submenu] addItem:[newDoppelganger_ menuItem]];
   [[fileMenuItem_ submenu] addItem:[openDoppelganger_ menuItem]];
   [[fileMenuItem_ submenu] addItem:[NSMenuItem separatorItem]];
   AddDuplicateItem(fileMenuItem_, IDC_FILE_MENU, IDC_CLOSE_WINDOW);
+  // Set the expected key equivalent explicitly here because
+  // -[AppControllerMac adjustCloseWindowMenuItemKeyEquivalent:] sets it to
+  // "W" (Cmd+Shift+w) when a tabbed window has focus; it will change it back
+  // to Cmd+w when a non-tabbed window has focus.
+  [[[fileMenuItem_ submenu] itemWithTag:IDC_CLOSE_WINDOW]
+      setKeyEquivalent:@"w"];
 
   // Edit menu. This copies the menu entirely and removes
   // "Paste and Match Style" and "Find". This is because the last two items,
   // "Start Dictation" and "Special Characters" are added by OSX, so we can't
   // copy them explicitly.
   editMenuItem_.reset([[[NSApp mainMenu] itemWithTag:IDC_EDIT_MENU] copy]);
   NSMenu* editMenu = [editMenuItem_ submenu];
   [editMenu removeItem:[editMenu
       itemWithTag:IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE]];
   [editMenu removeItem:[editMenu itemWithTag:IDC_FIND_MENU]];
@@ skipping 117 matching lines @@
 
 - (void)focusCurrentPlatformApp {
   apps::ShellWindow* shellWindow =
       apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile(
           [NSApp keyWindow]);
   if (shellWindow)
     apps::ExtensionAppShimHandler::FocusAppForWindow(shellWindow);
 }
 
 @end