Fixed "Close Window" shortcut in File Menu for Hosted/Packaged apps.

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 "base/mac/scoped_nsautorelease_pool.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 122 matching lines @@
 
 @property(readonly, nonatomic) NSMenuItem* menuItem;
 
 // Get the source item using the tags and create the menu item.
 - (id)initWithController:(AppShimMenuController*)controller
                  menuTag:(NSInteger)menuTag
                  itemTag:(NSInteger)itemTag
               resourceId:(int)resourceId
                   action:(SEL)action
            keyEquivalent:(NSString*)keyEquivalent;
+// Retain the source item given |menuTag| and |sourceItemTag|. Copy
+// the menu item given |menuTag| and |targetItemTag|.
+// This is useful when we want a doppelganger with a different source item.
+// For example, if there are conflicting key equivalents.
+- (id)initWithMenuTag:(NSInteger)menuTag
+        sourceItemTag:(NSInteger)sourceItemTag
+        targetItemTag:(NSInteger)targetItemTag
+        keyEquivalent:(NSString*)keyEquivalent;
 // Set the title using |resourceId_| and unset the source item's key equivalent.
 - (void)enableForApp:(const extensions::Extension*)app;
 // Restore the source item's key equivalent.
 - (void)disable;
 @end
 
 @implementation DoppelgangerMenuItem
 
 - (NSMenuItem*)menuItem {
   return menuItem_;
@@ skipping 13 matching lines @@
         initWithTitle:[sourceItem_ title]
                action:action
         keyEquivalent:keyEquivalent]);
     [menuItem_ setTarget:controller];
     [menuItem_ setTag:itemTag];
     resourceId_ = resourceId;
   }
   return self;
 }
 
+- (id)initWithMenuTag:(NSInteger)menuTag
+        sourceItemTag:(NSInteger)sourceItemTag
+        targetItemTag:(NSInteger)targetItemTag
+        keyEquivalent:(NSString*)keyEquivalent {
+  if ((self = [super init])) {
+    menuItem_.reset([GetItemByTag(menuTag, targetItemTag) copy]);
+    sourceItem_.reset([GetItemByTag(menuTag, sourceItemTag) retain]);

[tapted, 2015/02/04 23:55:59]

DCHECK(menuItem_);
DCHECK(sourceItem_);

ObjC likes to silently fail when calling methods on nil objects, so it's
important to check in case the model changes from under us.

[mitchellj, 2015/02/05 00:01:34]

Done.

+    sourceKeyEquivalent_.reset([[sourceItem_ keyEquivalent] copy]);
+    resourceId_ = 0;

[tapted, 2015/02/04 23:55:59]

nit: this is redundant for ObjC (it's guaranteed to be default-initialized
already)

[mitchellj, 2015/02/05 00:01:34]

Done.

+  }
+  return self;
+}
+
 - (void)enableForApp:(const extensions::Extension*)app {
   // It seems that two menu items that have the same key equivalent must also
   // have the same action for the keyboard shortcut to work. (This refers to the
   // original keyboard shortcut, regardless of any overrides set in OSX).
   // In order to let the app menu items have a different action, we remove the
   // key equivalent of the original items and restore them later.
   [sourceItem_ setKeyEquivalent:@""];
   if (!resourceId_)
     return;
 
@@ skipping 67 matching lines @@
               resourceId:IDS_EXIT_MAC
                   action:@selector(quitCurrentPlatformApp)
            keyEquivalent:@"q"]);
   newDoppelganger_.reset([[DoppelgangerMenuItem alloc]
       initWithController:self
                  menuTag:IDC_FILE_MENU
                  itemTag:IDC_NEW_WINDOW
               resourceId:0
                   action:nil
            keyEquivalent:@"n"]);
+  // Since the "Close Window" menu item will have the same shortcut as "Close
+  // Tab" on the Chrome menu, we need to create a doppelganger.
+  closeWindowDoppelganger_.reset([[DoppelgangerMenuItem alloc]
+                initWithMenuTag:IDC_FILE_MENU
+                  sourceItemTag:IDC_CLOSE_TAB
+                  targetItemTag:IDC_CLOSE_WINDOW
+                  keyEquivalent:@"w"]);
   // For apps, the "Window" part of "New Window" is dropped to match the default
   // menu set given to Cocoa Apps.
   [[newDoppelganger_ menuItem] setTitle:l10n_util::GetNSString(IDS_NEW_MAC)];
   openDoppelganger_.reset([[DoppelgangerMenuItem alloc]
       initWithController:self
                  menuTag:IDC_FILE_MENU
                  itemTag:IDC_OPEN_FILE
               resourceId:0
                   action:nil
            keyEquivalent:@"o"]);
@@ skipping 18 matching lines @@
   [appMenu addItem:[NSMenuItem separatorItem]];
   [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.
-  NSMenuItem* closeWindowMenuItem =
-      [[fileMenuItem_ submenu] itemWithTag:IDC_CLOSE_WINDOW];
-  [closeWindowMenuItem setKeyEquivalent:@"w"];
-  [closeWindowMenuItem setKeyEquivalentModifierMask:NSCommandKeyMask];
+  [[fileMenuItem_ submenu] addItem:[closeWindowDoppelganger_ menuItem]];
 
   // Edit menu. We copy the menu 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]);
 
   // View menu. Remove "Always Show Bookmark Bar" and separator.
   viewMenuItem_.reset([[[NSApp mainMenu] itemWithTag:IDC_VIEW_MENU] copy]);
   RemoveMenuItemWithTag(viewMenuItem_, IDC_SHOW_BOOKMARK_BAR, YES);
 
@@ skipping 80 matching lines @@
   // Hide Chrome menu items.
   NSMenu* mainMenu = [NSApp mainMenu];
   for (NSMenuItem* item in [mainMenu itemArray])
     [item setHidden:YES];
 
   [aboutDoppelganger_ enableForApp:app];
   [hideDoppelganger_ enableForApp:app];
   [quitDoppelganger_ enableForApp:app];
   [newDoppelganger_ enableForApp:app];
   [openDoppelganger_ enableForApp:app];
+  [closeWindowDoppelganger_ enableForApp:app];
 
   [appMenuItem_ setTitle:appId];
   [[appMenuItem_ submenu] setTitle:title];
 
   [mainMenu addItem:appMenuItem_];
   [mainMenu addItem:fileMenuItem_];
 
   SetItemWithTagVisible(editMenuItem_,
                         IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE,
                         app->is_hosted_app(), true);
@@ skipping 26 matching lines @@
 
   // Restore the Chrome main menu bar.
   for (NSMenuItem* item in [mainMenu itemArray])
     [item setHidden:NO];
 
   [aboutDoppelganger_ disable];
   [hideDoppelganger_ disable];
   [quitDoppelganger_ disable];
   [newDoppelganger_ disable];
   [openDoppelganger_ disable];
+  [closeWindowDoppelganger_ disable];
 }
 
 - (void)quitCurrentPlatformApp {
   extensions::AppWindow* appWindow =
       AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(
           [NSApp keyWindow]);
   if (appWindow) {
     apps::ExtensionAppShimHandler::QuitAppForWindow(appWindow);
   } else {
     Browser* browser = chrome::FindBrowserWithWindow([NSApp keyWindow]);
@@ skipping 23 matching lines @@
 
 - (void)focusCurrentPlatformApp {
   extensions::AppWindow* appWindow =
       AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(
           [NSApp keyWindow]);
   if (appWindow)
     apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow);
 }
 
 @end