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];
 }
 
+// Sets the menu item with |item_tag| in |top_level_item| visible.
+// Assumes that the menu item only has exactly one alternate, since AppKit

[tapted, 2015/01/30 00:52:48]

I think it needs to say

If |has_alternate| is true, the item immediately following |item_tag| is assumed
to be its (only) alternate. Since AppKit is unable to hide items with
alternates, |has_alternate| will cause -[NSMenuItem alternate] to be removed
when hiding and restored when showing.

[mitchellj, 2015/01/30 02:53:38]

Done.

+// requires that alternate menu items are hidden first.
+void SetItemWithTagVisible(NSMenuItem* top_level_item,
+                           NSInteger item_tag,
+                           bool visible,
+                           bool has_alternate) {
+  NSMenu* submenu = [top_level_item submenu];
+  NSMenuItem* menuItem = [submenu itemWithTag:item_tag];

[tapted, 2015/01/30 00:52:48]

itemWithTag returns `nil` if the tag isn't found. `[submenu indexOfItem:nil]`
might then return -1 ... which we add 1 to, thus making `nextIndex` a valid,
`0`. So: DCHECK(menu_item) after this.

[tapted, 2015/01/30 00:52:48]

Since it's not an objective-C method, hacker_style for variables - menu_item,
next_index.

[mitchellj, 2015/01/30 02:53:38]

Done.

[mitchellj, 2015/01/30 02:53:38]

Done.

+  NSInteger nextIndex = [submenu indexOfItem:menuItem] + 1;
+
+  // If no menu item follows the current one, then set visibility and return.
+  if (!has_alternate || nextIndex >= [submenu numberOfItems]) {

[tapted, 2015/01/30 00:52:48]

I think `nextIndex >= [submenu numberOfItems]` is not a valid thing to check
here. If has_alternate is true, it is a programming error to specify something
that doesn't have an item after it.

Can you move the |next_index| declaration further down. and turn the
out-of-bounds check into a DCHECK?

[mitchellj, 2015/01/30 02:53:38]

Done.

+    [menuItem setHidden:!visible];
+    return;
+  }
+
+  NSMenuItem* nextMenuItem = [submenu itemAtIndex:nextIndex];
+  [nextMenuItem setAlternate:visible];
+  [nextMenuItem setHidden:!visible];
+  [menuItem setHidden:!visible];
+}
+
 }  // 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_];
+
+  if (!app->is_hosted_app()) {
+    SetItemWithTagVisible(
+        editMenuItem_, IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE, false, true);

[tapted, 2015/01/30 00:52:48]

how about

  SetItemWithTagVisible(
      editMenuItem_, IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE,
      app->is_hosted_app(), true);
  SetItemWithTagVisible(
      editMenuItem_, IDC_FIND_MENU, app->is_hosted_app(), false);

[mitchellj, 2015/01/30 02:53:38]

Done.

+    SetItemWithTagVisible(editMenuItem_, IDC_FIND_MENU, false, false);
+  } else {
+    SetItemWithTagVisible(
+        editMenuItem_, IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE, true, true);
+    SetItemWithTagVisible(editMenuItem_, IDC_FIND_MENU, true, false);
+  }
   [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