Hide Available Offline menu item in gear menu

There is an Available Offline toggle already on the toolbar, so this
menu item is superfluous.

Bug: 1145058
Change-Id: Ifa48b9e6c40d49be181f48b30c308cc0fbf1d329
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526873
Commit-Queue: Austin Tankiang <austinct@chromium.org>
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826663}

ui/file_manager/file_manager/foreground/js/ui/actions_submenu.js

@@ -92,6 +92,7 @@ class ActionsSubmenu {
     if (saveForOfflineAction || offlineNotNecessaryAction) {
       const menuItem = this.addMenuItem_({});
       menuItem.command = '#toggle-pinned';
+      menuItem.classList.toggle('hide-on-toolbar', true);
       if (saveForOfflineAction) {
         delete remainingActions[ActionsModel.CommonActionId.SAVE_FOR_OFFLINE];
       }
@@ -103,9 +104,14 @@ class ActionsSubmenu {
     util.queryDecoratedElement('#toggle-pinned', cr.ui.Command)
         .canExecuteChange(element);
 
+    let hasCustomActions = false;
     // Process all the rest as custom actions.
     Object.keys(remainingActions).forEach(key => {
+      // Certain actions (e.g. 'pin-folder' to Directory tree) do not seem to
+      // have a title, and thus don't appear in the menu even though we add it
+      // to the DOM.
       const action = remainingActions[key];
+      hasCustomActions = hasCustomActions || !!action.getTitle();
       const options = {label: action.getTitle()};
       const menuItem = this.addMenuItem_(options);
 
@@ -114,6 +120,10 @@ class ActionsSubmenu {
       });
     });
 
+    // All actions that are not custom actions are hide-on-toolbar, so
+    // set hide-on-toolbar for the separator if there are no custom actions.
+    this.separator_.classList.toggle('hide-on-toolbar', !hasCustomActions);
+
     this.separator_.hidden = !this.items_.length;
   }
 }

ui/file_manager/integration_tests/file_manager/drive_specific.js

@@ -519,8 +519,8 @@ testcase.driveBackupPhotos = async () => {
 };
 
 /**
- * Verify that "Available Offline" is available from the gear menu for a drive
- * file before the context menu has been opened.
+ * Verify that "Available Offline" is not available from the gear menu for a
+ * drive file.
  */
 testcase.driveAvailableOfflineGearMenu = async () => {
   const pinnedMenuQuery = '#file-context-menu:not([hidden]) ' +
@@ -545,17 +545,20 @@ testcase.driveAvailableOfflineGearMenu = async () => {
   // Ensure gear button is available
   await remoteCall.waitForElement(appId, '#selection-menu-button');
 
-  // Click on gear menu and ensure "Available Offline" is shown.
+  // Click on gear menu and ensure "Available Offline" is not shown.
   chrome.test.assertTrue(await remoteCall.callRemoteTestUtil(
       'fakeMouseClick', appId, ['#selection-menu-button']));
 
-  // Check that "Available Offline" is shown in the menu.
-  await remoteCall.waitForElement(appId, pinnedMenuQuery);
+  // Check that "Available Offline" is not shown in the menu. This element is
+  // hidden via a display:none css rule, so check that.
+  const e = await remoteCall.waitForElementStyles(
+      appId, pinnedMenuQuery, ['display']);
+  chrome.test.assertEq('none', e.styles.display);
 };
 
 /**
- * Verify that "Available Offline" is available from the gear menu for a drive
- * directory before the context menu has been opened.
+ * Verify that "Available Offline" is not available from the gear menu for a
+ * drive directory.
  */
 testcase.driveAvailableOfflineDirectoryGearMenu = async () => {
   const pinnedMenuQuery = '#file-context-menu:not([hidden]) ' +
@@ -580,12 +583,15 @@ testcase.driveAvailableOfflineDirectoryGearMenu = async () => {
   // Ensure gear button is available
   await remoteCall.waitForElement(appId, '#selection-menu-button');
 
-  // Click on gear menu and ensure "Available Offline" is shown.
+  // Click on gear menu and ensure "Available Offline" is not shown.
   chrome.test.assertTrue(await remoteCall.callRemoteTestUtil(
       'fakeMouseClick', appId, ['#selection-menu-button']));
 
-  // Check that "Available Offline" is shown in the menu.
-  await remoteCall.waitForElement(appId, pinnedMenuQuery);
+  // Check that "Available Offline" is not shown in the menu. This element is
+  // hidden via a display:none css rule, so check that.
+  const e = await remoteCall.waitForElementStyles(
+      appId, pinnedMenuQuery, ['display']);
+  chrome.test.assertEq('none', e.styles.display);
 };
 
 /**