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

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

Index: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
index 38004c5fa33de775a6332b374d5342bc453903c6..b64b87d66f403bc1ab16a53fc1cd60560c144345 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm
@@ -237,6 +237,12 @@ void AddDuplicateItem(NSMenuItem* top_level_item,
   [[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,