Mac: Create share submenu when initially building main menu

When the native share menu was an experiment, we needed to replace the
Email Page Location menu item at runtime if the experiment was enabled.

It's now been enabled for a while, so this change removes the Email
Page Location menu item entirely and creates the Share menu item as
part of the initial menu creation.

Also removes the experiment infrastructure for share menu.

Bug: 770804
Change-Id: If5f17c213ffb185b461ee4e766423c647cb43e18
Reviewed-on: https://chromium-review.googlesource.com/1152007
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579110}

chrome/app/generated_resources.grd

@@ -7448,9 +7448,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
         <message name="IDS_EMAIL_LINK_MAC" desc="The Mac menu item to email a link to the current page in the share submenu">
           Email Link
         </message>
-        <message name="IDS_EMAIL_PAGE_LOCATION_MAC" desc="The Mac menu item to email the page location in the file menu.">
-          Email Page Location
-        </message>
         <message name="IDS_SHARING_MORE_MAC" desc="The Mac menu item to see more macOS share extensions in the share menu.">
           More...
         </message>

chrome/browser/about_flags.cc

@@ -3537,11 +3537,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kHtmlBasedUsernameDetectorDescription, kOsAll,
      FEATURE_VALUE_TYPE(
          password_manager::features::kHtmlBasedUsernameDetector)},
-#if defined(OS_MACOSX)
-    {"mac-system-share-menu", flag_descriptions::kMacSystemShareMenuName,
-     flag_descriptions::kMacSystemShareMenuDescription, kOsMac,
-     FEATURE_VALUE_TYPE(features::kMacSystemShareMenu)},
-#endif  // defined(OS_MACOSX)
 
     {"enable-new-preconnect", flag_descriptions::kSpeculativePreconnectName,
      flag_descriptions::kSpeculativePreconnectDescription, kOsAll,

chrome/browser/app_controller_mac.mm

@@ -417,12 +417,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
       [viewMenu removeItem:customizeItem];
   }
 
-  // In |applicationWillFinishLaunching| because FeatureList isn't
-  // available at init time.
-  if (base::FeatureList::IsEnabled(features::kMacSystemShareMenu)) {
-    // Initialize the share menu.
-    [self initShareMenu];
-  }
+  [self initShareMenu];
 
   // Remove "Enable Javascript in Apple Events" if the feature is disabled.
   if (!base::FeatureList::IsEnabled(
@@ -1298,21 +1293,11 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
   NSMenu* mainMenu = [NSApp mainMenu];
   NSMenu* fileMenu = [[mainMenu itemWithTag:IDC_FILE_MENU] submenu];
   NSString* shareMenuTitle = l10n_util::GetNSString(IDS_SHARE_MAC);
-  base::scoped_nsobject<NSMenuItem> shareMenuItem([[NSMenuItem alloc]
-      initWithTitle:shareMenuTitle
-             action:NULL
-      keyEquivalent:@""]);
+  NSMenuItem* shareMenuItem = [fileMenu itemWithTitle:shareMenuTitle];
   base::scoped_nsobject<NSMenu> shareSubmenu(
       [[NSMenu alloc] initWithTitle:shareMenuTitle]);
   [shareSubmenu setDelegate:shareMenuController_];
   [shareMenuItem setSubmenu:shareSubmenu];
-  // Replace "Email Page Location" with Share.
-  // TODO(crbug.com/770804): Remove this code and update the XIB when
-  // the share menu launches.
-  NSInteger index = [fileMenu indexOfItemWithTag:IDC_EMAIL_PAGE_LOCATION];
-  DCHECK(index != -1);
-  [fileMenu removeItemAtIndex:index];
-  [fileMenu insertItem:shareMenuItem atIndex:index];
 }
 
 // The Confirm to Quit preference is atypical in that the preference lives in

chrome/browser/flag_descriptions.cc

@@ -2896,10 +2896,6 @@ const char kHostedAppsInWindowsDescription[] =
 const char kMacRTLName[] = "Enable RTL";
 const char kMacRTLDescription[] = "Mirrors the UI for RTL language users";
 
-const char kMacSystemShareMenuName[] = "Enable System Share Menu";
-const char kMacSystemShareMenuDescription[] =
-    "Enables sharing via macOS share extensions.";
-
 const char kMacTouchBarName[] = "Hardware Touch Bar";
 const char kMacTouchBarDescription[] = "Control the use of the Touch Bar.";
 

chrome/browser/flag_descriptions.h

@@ -1753,9 +1753,6 @@ extern const char kHostedAppsInWindowsDescription[];
 extern const char kMacRTLName[];
 extern const char kMacRTLDescription[];
 
-extern const char kMacSystemShareMenuName[];
-extern const char kMacSystemShareMenuDescription[];
-
 extern const char kMacTouchBarName[];
 extern const char kMacTouchBarDescription[];
 

chrome/browser/ui/cocoa/main_menu_builder.mm

@@ -96,8 +96,7 @@ base::scoped_nsobject<NSMenuItem> BuildFileMenu(NSApplication* nsapp,
                 Item(IDS_CLOSE_TAB_MAC).command_id(IDC_CLOSE_TAB),
                 Item(IDS_SAVE_PAGE_MAC).command_id(IDC_SAVE_PAGE),
                 Item().is_separator(),
-                Item(IDS_EMAIL_PAGE_LOCATION_MAC)
-                    .command_id(IDC_EMAIL_PAGE_LOCATION),
+                Item(IDS_SHARE_MAC),
                 Item().is_separator(), Item(IDS_PRINT).command_id(IDC_PRINT),
                 Item(IDS_PRINT_USING_SYSTEM_DIALOG_MAC)
                     .command_id(IDC_BASIC_PRINT)

chrome/common/chrome_features.cc

@@ -352,9 +352,6 @@ const base::Feature kMacRTL{"MacRTL", base::FEATURE_ENABLED_BY_DEFAULT};
 const base::Feature kMacFullSizeContentView{"MacFullSizeContentView",
                                             base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Enables "Share" submenu in File menu.
-const base::Feature kMacSystemShareMenu{"MacSystemShareMenu",
-                                        base::FEATURE_ENABLED_BY_DEFAULT};
 #endif
 
 #if defined(OS_MACOSX)

chrome/common/chrome_features.h

@@ -192,7 +192,6 @@ extern const base::Feature kLsdPermissionPrompt;
 #if defined(OS_MACOSX)
 extern const base::Feature kMacRTL;
 extern const base::Feature kMacFullSizeContentView;
-extern const base::Feature kMacSystemShareMenu;
 #endif
 
 #if defined(OS_MACOSX)

tools/gritsettings/startup_resources_mac.txt

@@ -21,7 +21,6 @@ IDS_OPEN_LOCATION_MAC 120
 IDS_CLOSE_WINDOW_MAC 121
 IDS_CLOSE_TAB_MAC 122
 IDS_SAVE_PAGE_MAC 123
-IDS_EMAIL_PAGE_LOCATION_MAC 124
 IDS_PRINT 125
 IDS_PRINT_USING_SYSTEM_DIALOG_MAC 126
 IDS_EDIT_MENU_MAC 127