Replicate standard menus for 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 "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"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"
 #include "chrome/common/extensions/extension.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
+namespace {
+
+// Gets an item from the main menu given the tag of the top level item
+// |menu_tag| and the tag of the item |item_tag|.
+NSMenuItem* GetItemByTag(NSInteger menu_tag, NSInteger item_tag) {
+  return [[[[NSApp mainMenu] itemWithTag:menu_tag] submenu]
+      itemWithTag:item_tag];
+}
+
+// Finds a top level menu item using |menu_tag| and creates a new NSMenuItem
+// with the same title, action, and key equivalent.
+NSMenuItem* DuplicateTopLevelItem(NSInteger menu_tag) {
+  NSMenuItem* original = [[NSApp mainMenu] itemWithTag:menu_tag];
+  base::scoped_nsobject<NSMenuItem> item([[NSMenuItem alloc]
+      initWithTitle:[original title]
+             action:[original action]
+      keyEquivalent:[original keyEquivalent]]);

[tapted, 2013/08/29 06:06:19]

Can top-level items have key equivalents, or actions? Pretty sure they can't, so
maybe just initWithTitle here, and update the function comment.

[jackhou1, 2013/08/29 06:30:03]

Done.

+  if ([original hasSubmenu]) {

[tapted, 2013/08/29 06:06:19]

DCHECK? I think later code assumes that a submenu has been copied into the
duplicate item.

[jackhou1, 2013/08/29 06:30:03]

Done.

+    base::scoped_nsobject<NSMenu> sub_menu([[NSMenu alloc]
+        initWithTitle:[[original submenu] title]]);
+    [item setSubmenu:sub_menu];
+  }
+  return item.autorelease();
+}
+
+// Finds an item using |menu_tag| and |item_tag| and adds a duplicate of it to
+// the submenu of |top_level_item|.
+NSMenuItem* AddDuplicateItem(NSMenuItem* top_level_item,

[tapted, 2013/08/29 06:06:19]

return void?

[jackhou1, 2013/08/29 06:30:03]

Done.

+                             NSInteger menu_tag,
+                             NSInteger item_tag) {
+  base::scoped_nsobject<NSMenuItem> item(
+      [GetItemByTag(menu_tag, item_tag) copy]);
+  [[top_level_item submenu] addItem:item];
+  return item;
+}
+
+}  // namespace
+
 @interface AppShimMenuController ()
 // Construct the NSMenuItems for apps.
 - (void)buildAppMenuItems;
 // Register for NSWindow notifications.
 - (void)registerEventHandlers;
 // If the window is an app window, add or remove menu items.
 - (void)windowMainStatusChanged:(NSNotification*)notification;
 // Add menu items for an app and hide Chrome menu items.
 - (void)addMenuItems:(const extensions::Extension*)app;
 // If the window belongs to the currently focused app, remove the menu items and
@@ skipping 13 matching lines @@
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
 - (void)buildAppMenuItems {
   // Find the "Quit Chrome" menu item.
-  NSMenu* chromeMenu = [[[NSApp mainMenu] itemAtIndex:0] submenu];
-  for (NSMenuItem* item in [chromeMenu itemArray]) {
-    if ([item action] == @selector(terminate:)) {
-      chromeMenuQuitItem_.reset([item retain]);
-      break;
-    }
-  }
+  NSMenuItem* chromeMenuQuitItem = GetItemByTag(IDC_CHROME_MENU, IDC_EXIT);

[tapted, 2013/08/29 06:06:19]

nit: probably don't need this temporary any more

[jackhou1, 2013/08/29 06:30:03]

Done.

+  chromeMenuQuitItem_.reset([chromeMenuQuitItem retain]);
   DCHECK(chromeMenuQuitItem_);
 
+  // The app's menu.
   appMenuItem_.reset([[NSMenuItem alloc] initWithTitle:@""
                                                 action:nil
                                          keyEquivalent:@""]);
   base::scoped_nsobject<NSMenu> appMenu([[NSMenu alloc] initWithTitle:@""]);
   [appMenu setAutoenablesItems:NO];
   NSMenuItem* appMenuQuitItem =
       [appMenu addItemWithTitle:@""
                          action:@selector(quitCurrentPlatformApp)
                   keyEquivalent:@"q"];
   [appMenuQuitItem setKeyEquivalentModifierMask:
       [chromeMenuQuitItem_ keyEquivalentModifierMask]];
   [appMenuQuitItem setTarget:self];
   [appMenuItem_ setSubmenu:appMenu];
+
+  // File menu.
+  fileMenuItem_.reset([DuplicateTopLevelItem(IDC_FILE_MENU) retain]);
+  AddDuplicateItem(fileMenuItem_, IDC_FILE_MENU, IDC_CLOSE_WINDOW);
+
+  // Edit menu.
+  editMenuItem_.reset([DuplicateTopLevelItem(IDC_EDIT_MENU) retain]);
+  AddDuplicateItem(editMenuItem_, IDC_EDIT_MENU, IDC_CONTENT_CONTEXT_UNDO);
+  AddDuplicateItem(editMenuItem_, IDC_EDIT_MENU, IDC_CONTENT_CONTEXT_REDO);
+  [[editMenuItem_ submenu] addItem:[NSMenuItem separatorItem]];
+  AddDuplicateItem(editMenuItem_, IDC_EDIT_MENU, IDC_CONTENT_CONTEXT_CUT);
+  AddDuplicateItem(editMenuItem_, IDC_EDIT_MENU, IDC_CONTENT_CONTEXT_COPY);
+  AddDuplicateItem(editMenuItem_, IDC_EDIT_MENU, IDC_CONTENT_CONTEXT_PASTE);
+  AddDuplicateItem(editMenuItem_, IDC_EDIT_MENU, IDC_CONTENT_CONTEXT_DELETE);
+  AddDuplicateItem(editMenuItem_, IDC_EDIT_MENU, IDC_CONTENT_CONTEXT_SELECTALL);
+
+  // Window menu.
+  windowMenuItem_.reset([DuplicateTopLevelItem(IDC_WINDOW_MENU) retain]);
+  AddDuplicateItem(windowMenuItem_, IDC_WINDOW_MENU, IDC_MINIMIZE);
+  AddDuplicateItem(windowMenuItem_, IDC_WINDOW_MENU, IDC_MAXIMIZE);
+  [[windowMenuItem_ submenu] addItem:[NSMenuItem separatorItem]];
+  AddDuplicateItem(windowMenuItem_, IDC_WINDOW_MENU, IDC_ALL_WINDOWS_FRONT);
 }
 
 - (void)registerEventHandlers {
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(windowMainStatusChanged:)
              name:NSWindowDidBecomeMainNotification
            object:nil];
 
   [[NSNotificationCenter defaultCenter]
@@ skipping 54 matching lines @@
 
   // 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 appMenuQuitItem have a different action, we remove the
   // key equivalent from the chromeMenuQuitItem and restore it later.
   [chromeMenuQuitItem_ setKeyEquivalent:@""];
 
   [appMenuItem_ setTitle:appId];
   [[appMenuItem_ submenu] setTitle:title];
+
   [mainMenu addItem:appMenuItem_];
+  [mainMenu addItem:fileMenuItem_];
+  [mainMenu addItem:editMenuItem_];
+  [mainMenu addItem:windowMenuItem_];
 }
 
 - (void)removeMenuItems:(NSString*)appId {
   if (![appId_ isEqualToString:appId])
     return;
 
   appId_.reset();
 
   NSMenu* mainMenu = [NSApp mainMenu];
   [mainMenu removeItem:appMenuItem_];
+  [mainMenu removeItem:fileMenuItem_];
+  [mainMenu removeItem:editMenuItem_];
+  [mainMenu removeItem:windowMenuItem_];
 
   // Restore the Chrome main menu bar.
   for (NSMenuItem* item in [mainMenu itemArray])
     [item setHidden:NO];
 
   // Restore the keyboard shortcut to Chrome. This just needs to be set back to
   // the original keyboard shortcut, regardless of any overrides in OSX. The
   // overrides still work as they are based on the title of the menu item.
   [chromeMenuQuitItem_ setKeyEquivalent:@"q"];
 }
 
 - (void)quitCurrentPlatformApp {
   apps::ShellWindow* shellWindow =
       apps::ShellWindowRegistry::GetShellWindowForNativeWindowAnyProfile(
           [NSApp keyWindow]);
   if (shellWindow)
     apps::ExtensionAppShimHandler::QuitAppForWindow(shellWindow);
 }
 
 @end