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..24be8f12d3db8a8eb5f9c140f90516b1caa6ae9c 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,13 @@ 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 Chrome's key

[tapted, 2014/01/09 06:54:55]

I would say "Set the expected key equivalent explicitly here because
-[AppControllerMac adjustCloseWindowMenuItemKeyEquivalent:] sets it to "W"
(Cmd+Shift+w) when a tabbed browser is active."

Then, for this case, won't we now have two menu items whose key equivalent is
Cmd+w? i.e. (our) "Close Window", and Chrome's "Close Tab"? How does it avoid
confusing Cocoa? Since, I thought that broke things, even when one of the menu
items is hidden.

[jackhou1, 2014/01/09 22:44:07]

Done.

AppControllerMac changes the key equivalent based on what kind of window has
focus. Since app windows are not tabbed, it'll set "Close Window" to Cmd+w,
which is consistent with the one here.
When a tabbed window has focus, the one here is removed from the main menu, so
"Close Tab" is the only item using Cmd+w.

+  // equivalent is sometimes "W" (Cmd+Shift+w), and "Close Tab" is mapped to
+  // Cmd+W. -[AppControllerMac adjustCloseWindowMenuItemKeyEquivalent:] manages
+  // this and will make "Close Window" have the Cmd+w shortcut when an app
+  // 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,