cros: Touchable App Context Menu dead code cleanup

Change-Id: Ifee152ae16c133e0d2dcf7f334e1ff7700a47167
Reviewed-on: https://chromium-review.googlesource.com/c/1341068Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Yury Khmel <khmel@chromium.org>
Commit-Queue: Alex Newcomer <newcomer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611011}

chrome/browser/ui/app_list/app_context_menu.cc

@@ -8,7 +8,6 @@
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_base_features.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icon_types.h"
 #include "ui/views/controls/menu/menu_config.h"
@@ -37,9 +36,6 @@ void AppContextMenu::GetMenuModel(GetMenuModelCallback callback) {
 void AppContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
   // Show Pin/Unpin option if shelf is available.
   if (controller_->GetPinnable(app_id()) != AppListControllerDelegate::NO_PIN) {
-    if (!features::IsTouchableAppContextMenuEnabled())
-      menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
-
     AddContextMenuOption(menu_model, ash::TOGGLE_PIN,
                          controller_->IsAppPinned(app_id_)
                              ? IDS_APP_LIST_CONTEXT_MENU_UNPIN
@@ -93,14 +89,12 @@ void AppContextMenu::TogglePin(const std::string& shelf_app_id) {
 void AppContextMenu::AddContextMenuOption(ui::SimpleMenuModel* menu_model,
                                           ash::CommandId command_id,
                                           int string_id) {
-  // Do not include disabled items in touchable menus.
-  if (features::IsTouchableAppContextMenuEnabled() &&
-      !IsCommandIdEnabled(command_id)) {
+  // Do not include disabled items.
+  if (!IsCommandIdEnabled(command_id))
     return;
-  }
 
   const gfx::VectorIcon& icon = GetMenuItemVectorIcon(command_id, string_id);
-  if (features::IsTouchableAppContextMenuEnabled() && !icon.is_empty()) {
+  if (!icon.is_empty()) {
     const views::MenuConfig& menu_config = views::MenuConfig::instance();
     menu_model->AddItemWithStringIdAndIcon(
         command_id, string_id,
@@ -178,9 +172,6 @@ void AppContextMenu::ExecuteCommand(int command_id, int event_flags) {
 
 bool AppContextMenu::GetIconForCommandId(int command_id,
                                          gfx::Image* icon) const {
-  if (!features::IsTouchableAppContextMenuEnabled())
-    return false;
-
   if (command_id == ash::TOGGLE_PIN) {
     const views::MenuConfig& menu_config = views::MenuConfig::instance();
     *icon = gfx::Image(gfx::CreateVectorIcon(

chrome/browser/ui/app_list/arc/arc_app_context_menu.cc

@@ -17,7 +17,6 @@
 #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
 #include "chrome/browser/ui/ash/tablet_mode_client.h"
 #include "chrome/grit/generated_resources.h"
-#include "ui/base/ui_base_features.h"
 
 ArcAppContextMenu::ArcAppContextMenu(app_list::AppContextMenuDelegate* delegate,
                                      Profile* profile,
@@ -30,10 +29,6 @@ ArcAppContextMenu::~ArcAppContextMenu() = default;
 void ArcAppContextMenu::GetMenuModel(GetMenuModelCallback callback) {
   auto menu_model = std::make_unique<ui::SimpleMenuModel>(this);
   BuildMenu(menu_model.get());
-  if (!features::IsTouchableAppContextMenuEnabled()) {
-    std::move(callback).Run(std::move(menu_model));
-    return;
-  }
   BuildAppShortcutsMenu(std::move(menu_model), std::move(callback));
 }
 
@@ -50,14 +45,10 @@ void ArcAppContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
   if (!controller()->IsAppOpen(app_id()) && !app_info->suspended) {
     AddContextMenuOption(menu_model, ash::LAUNCH_NEW,
                          IDS_APP_CONTEXT_MENU_ACTIVATE_ARC);
-    if (!features::IsTouchableAppContextMenuEnabled())
-      menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
   }
   // Create default items.
   app_list::AppContextMenu::BuildMenu(menu_model);
 
-  if (!features::IsTouchableAppContextMenuEnabled())
-    menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
   if (arc_prefs->IsShortcut(app_id())) {
     AddContextMenuOption(menu_model, ash::UNINSTALL,
                          IDS_APP_LIST_REMOVE_SHORTCUT);

chrome/browser/ui/app_list/extension_app_context_menu.cc

@@ -16,7 +16,6 @@
 #include "chrome/grit/generated_resources.h"
 #include "content/public/common/context_menu_params.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/ui_base_features.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/vector_icons.h"
@@ -92,45 +91,11 @@ void ExtensionAppContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
         base::Bind(MenuItemHasLauncherContext));
 
     // First, add the primary actions.
-    if (!is_platform_app_) {
-      if (features::IsTouchableAppContextMenuEnabled()) {
-        CreateOpenNewSubmenu(menu_model);
-      } else {
-        AddContextMenuOption(menu_model, ash::LAUNCH_NEW, GetLaunchStringId());
-        menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
-
-        // When bookmark apps are enabled, hosted apps can only toggle between
-        // USE_LAUNCH_TYPE_WINDOW and USE_LAUNCH_TYPE_REGULAR.
-        if (extensions::util::CanHostedAppsOpenInWindows() &&
-            extensions::util::IsNewBookmarkAppsEnabled()) {
-          // When both flags are enabled, only allow toggling between
-          // USE_LAUNCH_TYPE_WINDOW and USE_LAUNCH_TYPE_REGULAR
-          AddContextMenuOption(menu_model, ash::USE_LAUNCH_TYPE_WINDOW,
-                               IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
-        } else if (!extensions::util::IsNewBookmarkAppsEnabled()) {
-          // When new bookmark apps are disabled, add pinned and full screen
-          // options as well. Add open as window if CanHostedAppsOpenInWindows
-          // is enabled.
-          AddContextMenuOption(menu_model, ash::USE_LAUNCH_TYPE_REGULAR,
-                               IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
-          AddContextMenuOption(menu_model, ash::USE_LAUNCH_TYPE_PINNED,
-                               IDS_APP_CONTEXT_MENU_OPEN_PINNED);
-          if (extensions::util::CanHostedAppsOpenInWindows()) {
-            AddContextMenuOption(menu_model, ash::USE_LAUNCH_TYPE_WINDOW,
-                                 IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
-          }
-          // Even though the launch type is Full Screen it is more accurately
-          // described as Maximized in Ash.
-          AddContextMenuOption(menu_model, ash::USE_LAUNCH_TYPE_FULLSCREEN,
-                               IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);
-        }
-      }
-    }
+    if (!is_platform_app_)
+      CreateOpenNewSubmenu(menu_model);
 
     // Create default items.
     AppContextMenu::BuildMenu(menu_model);
-    if (!features::IsTouchableAppContextMenuEnabled())
-      menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
 
     // Assign unique IDs to commands added by the app itself.
     int index = ash::USE_LAUNCH_TYPE_COMMAND_END;
@@ -139,13 +104,6 @@ void ExtensionAppContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
         base::string16(),
         &index,
         false);  // is_action_menu
-
-    // If at least 1 item was added, add another separator after the list.
-    if (index > ash::USE_LAUNCH_TYPE_COMMAND_END &&
-        !features::IsTouchableAppContextMenuEnabled()) {
-      menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
-    }
-
     if (!is_platform_app_)
       AddContextMenuOption(menu_model, ash::OPTIONS, IDS_NEW_TAB_APP_OPTIONS);
 
@@ -172,9 +130,6 @@ base::string16 ExtensionAppContextMenu::GetLabelForCommandId(
 
 bool ExtensionAppContextMenu::GetIconForCommandId(int command_id,
                                                   gfx::Image* icon) const {
-  if (!features::IsTouchableAppContextMenuEnabled())
-    return false;
-
   if (command_id == ash::TOGGLE_PIN)
     return AppContextMenu::GetIconForCommandId(command_id, icon);
 

chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc

@@ -16,7 +16,6 @@
 #include "chrome/browser/ui/ash/launcher/arc_app_shelf_id.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/grit/generated_resources.h"
-#include "ui/base/ui_base_features.h"
 
 ArcLauncherContextMenu::ArcLauncherContextMenu(
     ChromeLauncherController* controller,
@@ -63,8 +62,6 @@ void ArcLauncherContextMenu::BuildMenu(
     DCHECK(app_info->launchable);
     AddContextMenuOption(menu_model.get(), ash::MENU_OPEN_NEW,
                          IDS_APP_CONTEXT_MENU_ACTIVATE_ARC);
-    if (!features::IsTouchableAppContextMenuEnabled())
-      menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
   }
 
   if (!app_id.has_shelf_group_id() && app_info->launchable)
@@ -74,14 +71,6 @@ void ArcLauncherContextMenu::BuildMenu(
     AddContextMenuOption(menu_model.get(), ash::MENU_CLOSE,
                          IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
   }
-  if (!features::IsTouchableAppContextMenuEnabled())
-    menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
-
-  // App shortcuts from Android are shown on touchable context menu only.
-  if (!features::IsTouchableAppContextMenuEnabled()) {
-    std::move(callback).Run(std::move(menu_model));
-    return;
-  }
 
   DCHECK(!app_shortcuts_menu_builder_);
   app_shortcuts_menu_builder_ =

chrome/browser/ui/ash/launcher/crostini_shelf_context_menu.cc

@@ -15,7 +15,6 @@
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/views/crostini/crostini_app_restart_view.h"
 #include "chrome/grit/generated_resources.h"
-#include "ui/base/ui_base_features.h"
 #include "ui/strings/grit/ui_strings.h"
 
 CrostiniShelfContextMenu::CrostiniShelfContextMenu(
@@ -72,9 +71,6 @@ void CrostiniShelfContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
                                            IDS_CROSTINI_USE_LOW_DENSITY);
     }
   }
-
-  if (!features::IsTouchableAppContextMenuEnabled())
-    menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
 }
 
 void CrostiniShelfContextMenu::ExecuteCommand(int command_id, int event_flags) {

chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc

@@ -21,7 +21,6 @@
 #include "chrome/grit/generated_resources.h"
 #include "content/public/common/context_menu_params.h"
 #include "extensions/browser/extension_prefs.h"
-#include "ui/base/ui_base_features.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/menu/menu_config.h"
@@ -179,40 +178,8 @@ void ExtensionLauncherContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
       base::Bind(MenuItemHasLauncherContext)));
   if (item().type == ash::TYPE_PINNED_APP || item().type == ash::TYPE_APP) {
     // V1 apps can be started from the menu - but V2 apps should not.
-    if (!controller()->IsPlatformApp(item().id)) {
-      if (features::IsTouchableAppContextMenuEnabled()) {
-        CreateOpenNewSubmenu(menu_model);
-      } else {
-        AddContextMenuOption(menu_model, ash::MENU_OPEN_NEW,
-                             GetLaunchTypeStringId());
-        menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
-
-        // Touchable app context menus do not include these check items, their
-        // functionality is achieved by an actionable submenu.
-        if (item().type == ash::TYPE_PINNED_APP) {
-          if (extensions::util::IsNewBookmarkAppsEnabled()) {
-            // With bookmark apps enabled, hosted apps launch in a window by
-            // default. This menu item is re-interpreted as a single,
-            // toggle-able option to launch the hosted app as a tab.
-            AddContextMenuOption(menu_model, ash::LAUNCH_TYPE_WINDOW,
-                                 IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
-          } else {
-            AddContextMenuOption(menu_model, ash::LAUNCH_TYPE_REGULAR_TAB,
-                                 IDS_APP_CONTEXT_MENU_OPEN_REGULAR);
-            AddContextMenuOption(menu_model, ash::LAUNCH_TYPE_PINNED_TAB,
-                                 IDS_APP_CONTEXT_MENU_OPEN_PINNED);
-            AddContextMenuOption(menu_model, ash::LAUNCH_TYPE_WINDOW,
-                                 IDS_APP_CONTEXT_MENU_OPEN_WINDOW);
-            // Even though the launch type is Full Screen it is more accurately
-            // described as Maximized in Ash.
-            AddContextMenuOption(menu_model, ash::LAUNCH_TYPE_FULLSCREEN,
-                                 IDS_APP_CONTEXT_MENU_OPEN_MAXIMIZED);
-          }
-          menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
-        }
-      }
-    }
-
+    if (!controller()->IsPlatformApp(item().id))
+      CreateOpenNewSubmenu(menu_model);
     AddPinMenu(menu_model);
 
     if (controller()->IsOpen(item().id)) {
@@ -238,16 +205,12 @@ void ExtensionLauncherContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
     AddContextMenuOption(menu_model, ash::MENU_CLOSE,
                          IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
   }
-  if (!features::IsTouchableAppContextMenuEnabled())
-    menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
   if (item().type == ash::TYPE_PINNED_APP || item().type == ash::TYPE_APP) {
     const extensions::MenuItem::ExtensionKey app_key(item().id.app_id);
     if (!app_key.empty()) {
       int index = 0;
       extension_items_->AppendExtensionItems(app_key, base::string16(), &index,
                                              false);  // is_action_menu
-      if (!features::IsTouchableAppContextMenuEnabled())
-        menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
     }
   }
 }

chrome/browser/ui/ash/launcher/internal_app_shelf_context_menu.cc

@@ -12,7 +12,6 @@
 #include "chrome/browser/ui/app_list/internal_app/internal_app_metadata.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/grit/generated_resources.h"
-#include "ui/base/ui_base_features.h"
 
 InternalAppShelfContextMenu::InternalAppShelfContextMenu(
     ChromeLauncherController* controller,
@@ -31,8 +30,6 @@ void InternalAppShelfContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
   if (!app_is_open) {
     AddContextMenuOption(menu_model, ash::MENU_OPEN_NEW,
                          IDS_APP_CONTEXT_MENU_ACTIVATE_ARC);
-    if (!features::IsTouchableAppContextMenuEnabled())
-      menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
   }
 
   const auto* internal_app = app_list::FindInternalApp(item().id.app_id);
@@ -44,8 +41,4 @@ void InternalAppShelfContextMenu::BuildMenu(ui::SimpleMenuModel* menu_model) {
     AddContextMenuOption(menu_model, ash::MENU_CLOSE,
                          IDS_LAUNCHER_CONTEXT_MENU_CLOSE);
   }
-
-  // Default menu items, e.g. "Autohide shelf" are appended. Adding a separator.
-  if (!features::IsTouchableAppContextMenuEnabled())
-    menu_model->AddSeparator(ui::NORMAL_SEPARATOR);
 }

chrome/browser/ui/ash/launcher/launcher_context_menu.cc

@@ -22,7 +22,6 @@
 #include "chrome/browser/ui/ash/launcher/internal_app_shelf_context_menu.h"
 #include "chrome/browser/ui/ash/tablet_mode_client.h"
 #include "chrome/grit/generated_resources.h"
-#include "ui/base/ui_base_features.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/menu/menu_config.h"
@@ -163,7 +162,7 @@ void LauncherContextMenu::AddContextMenuOption(ui::SimpleMenuModel* menu_model,
                                                ash::CommandId type,
                                                int string_id) {
   const gfx::VectorIcon& icon = GetCommandIdVectorIcon(type, string_id);
-  if (features::IsTouchableAppContextMenuEnabled() && !icon.is_empty()) {
+  if (!icon.is_empty()) {
     const views::MenuConfig& menu_config = views::MenuConfig::instance();
     menu_model->AddItemWithStringIdAndIcon(
         type, string_id,