Added 'Find'/'Paste and Match Style' menu items for hosted apps on 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 "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 57 matching lines @@
   [submenu removeItemAtIndex:index];
 
   if (!remove_following_separator || index == [submenu numberOfItems])
     return;
 
   NSMenuItem* nextItem = [submenu itemAtIndex:index];
   if ([nextItem isSeparatorItem])
     [submenu removeItem:nextItem];
 }
 
+void HideMenuItemWithIndex(NSMenuItem* top_level_item,

[tapted, 2015/01/29 05:13:37]

Comment for this function - e.g. it's a bit subtle what's going on with the
alternate stuff, and why it's necessary to pass it in rather than get it from
[NSMenuItem isAlternate] 

[tapted, 2015/01/29 05:13:37]

Since it both hides and shows, a better name would be something like
`SetItemAtIndexVisible` (and invert the meaning of hidden -> visible so there
isn't a double negative

[mitchellj, 2015/01/30 00:06:57]

Done.

+                           NSInteger index,

[tapted, 2015/01/29 05:13:37]

could you use WithTag instead? combined with has_alternate, this should be
sufficient and help encapsulate the oddness around those

[mitchellj, 2015/01/30 00:06:57]

Done.

+                           bool hidden,
+                           bool isAlternateMenuItem) {

[tapted, 2015/01/29 05:13:37]

since this isn't an Objective C method, use hacker_style for arguments.

[mitchellj, 2015/01/30 00:06:57]

Done.

+  NSMenu* submenu = [top_level_item submenu];
+  if (index >= [submenu numberOfItems])

[tapted, 2015/01/29 05:13:37]

if this ever hit? DCHECK instead?

[mitchellj, 2015/01/30 00:06:57]

This is now checked, as we are grabbing the next menu item.

+    return;
+
+  NSMenuItem* menuItem = [submenu itemAtIndex:index];
+  if (isAlternateMenuItem)
+    [menuItem setAlternate:!hidden];
+  [menuItem setHidden:hidden];
+}
+
 }  // namespace
 
 // Used by AppShimMenuController to manage menu items that are a copy of a
 // Chrome menu item but with a different action. This manages unsetting and
 // restoring the original item's key equivalent, so that we can use the same
 // key equivalent in the copied item with a different action. If |resourceId_|
 // is non-zero, this will also update the title to include the app name.
 // If the copy (menuItem) has no key equivalent, and the title does not have the
 // app name, then enableForApp and disable do not need to be called. I.e. the
 // doppelganger just copies the item and sets a new action.
@@ skipping 175 matching lines @@
   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];
 
-  // 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.
+  // 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]);
-  RemoveMenuItemWithTag(editMenuItem_,
-                        IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE, NO);
-  RemoveMenuItemWithTag(editMenuItem_, IDC_FIND_MENU, NO);
 
   // 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);
 
   // History menu.
   historyMenuItem_.reset([NewTopLevelItemFrom(IDC_HISTORY_MENU) retain]);
   AddDuplicateItem(historyMenuItem_, IDC_HISTORY_MENU, IDC_BACK);
   AddDuplicateItem(historyMenuItem_, IDC_HISTORY_MENU, IDC_FORWARD);
 
@@ skipping 81 matching lines @@
   [hideDoppelganger_ enableForApp:app];
   [quitDoppelganger_ enableForApp:app];
   [newDoppelganger_ enableForApp:app];
   [openDoppelganger_ enableForApp:app];
 
   [appMenuItem_ setTitle:appId];
   [[appMenuItem_ submenu] setTitle:title];
 
   [mainMenu addItem:appMenuItem_];
   [mainMenu addItem:fileMenuItem_];
+
+  // Hide the "Paste and Match Style" and "Find" menu items for non-hosted
+  // apps from the Edit menu.
+  NSInteger pasteMatchStyleindex = [[editMenuItem_ submenu]

[tapted, 2015/01/29 05:13:37]

index -> Index

[mitchellj, 2015/01/30 00:06:57]

Done.

+      indexOfItemWithTag:IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE];
+  if (!app->is_hosted_app()) {
+    // We need to hide the alternate menu item to "Patch and Match Style"

[tapted, 2015/01/29 05:13:37]

I'd say this more like

// AppKit requires that alternate menu items are hidden first.

[mitchellj, 2015/01/30 00:06:57]

Done. Moved this comment to the new function SetItemWithTagVisible.

+    // first.
+    HideMenuItemWithIndex(editMenuItem_, pasteMatchStyleindex + 1, YES, YES);

[tapted, 2015/01/29 05:13:37]

since they are being passed to bool (not BOOL) use true/false instead of YES/NO

[mitchellj, 2015/01/30 00:06:57]

Done.

+    HideMenuItemWithIndex(editMenuItem_, pasteMatchStyleindex, YES, NO);
+    HideMenuItemWithIndex(
+        editMenuItem_,
+        [[editMenuItem_ submenu] indexOfItemWithTag:IDC_FIND_MENU], YES, NO);

[tapted, 2015/01/29 05:13:37]

nit: make a temporary for this, same as pasteMatchStyle, since it's spread over
3 lines here anyway.

[mitchellj, 2015/01/30 00:06:57]

Done.

+  } else {
+    HideMenuItemWithIndex(editMenuItem_, pasteMatchStyleindex + 1, NO, YES);
+    HideMenuItemWithIndex(editMenuItem_, pasteMatchStyleindex, NO, NO);
+    HideMenuItemWithIndex(
+        editMenuItem_,
+        [[editMenuItem_ submenu] indexOfItemWithTag:IDC_FIND_MENU], NO, NO);
+  }
   [mainMenu addItem:editMenuItem_];
+
   if (app->is_hosted_app()) {
     [mainMenu addItem:viewMenuItem_];
     [mainMenu addItem:historyMenuItem_];
   }
   [mainMenu addItem:windowMenuItem_];
 }
 
 - (void)removeMenuItems {
   if (!appId_)
     return;
@@ skipping 55 matching lines @@
 
 - (void)focusCurrentPlatformApp {
   extensions::AppWindow* appWindow =
       AppWindowRegistryUtil::GetAppWindowForNativeWindowAnyProfile(
           [NSApp keyWindow]);
   if (appWindow)
     apps::ExtensionAppShimHandler::FocusAppForWindow(appWindow);
 }
 
 @end