CrOS: Merge |GetMenuModel| and |BuildMenu| methods in context menus.

Bug: 1011130
Change-Id: I4ac437f1e6e4bbfc831c50edb06359824b25bc62
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1935039Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Manu Cornet <manucornet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718899}

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

@@ -34,12 +34,7 @@ ArcLauncherContextMenu::ArcLauncherContextMenu(
 ArcLauncherContextMenu::~ArcLauncherContextMenu() = default;
 
 void ArcLauncherContextMenu::GetMenuModel(GetMenuModelCallback callback) {
-  BuildMenu(std::make_unique<ui::SimpleMenuModel>(this), std::move(callback));
-}
-
-void ArcLauncherContextMenu::BuildMenu(
-    std::unique_ptr<ui::SimpleMenuModel> menu_model,
-    GetMenuModelCallback callback) {
+  auto menu_model = std::make_unique<ui::SimpleMenuModel>(this);
   const ArcAppListPrefs* arc_list_prefs =
       ArcAppListPrefs::Get(controller()->profile());
   DCHECK(arc_list_prefs);

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

@@ -24,8 +24,6 @@ class ArcLauncherContextMenu : public LauncherContextMenu {
 
   // LauncherContextMenu:
   void GetMenuModel(GetMenuModelCallback callback) override;
-  void BuildMenu(std::unique_ptr<ui::SimpleMenuModel> menu_model,
-                 GetMenuModelCallback callback) override;
   bool IsCommandIdEnabled(int command_id) const override;
   void ExecuteCommand(int command_id, int event_flags) override;
 

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

@@ -54,12 +54,6 @@ CrostiniShelfContextMenu::~CrostiniShelfContextMenu() = default;
 
 void CrostiniShelfContextMenu::GetMenuModel(GetMenuModelCallback callback) {
   auto menu_model = std::make_unique<ui::SimpleMenuModel>(this);
-  BuildMenu(std::move(menu_model), std::move(callback));
-}
-
-void CrostiniShelfContextMenu::BuildMenu(
-    std::unique_ptr<ui::SimpleMenuModel> menu_model,
-    GetMenuModelCallback callback) {
   const crostini::CrostiniRegistryService* registry_service =
       crostini::CrostiniRegistryServiceFactory::GetForProfile(
           controller()->profile());

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

@@ -18,8 +18,6 @@ class CrostiniShelfContextMenu : public LauncherContextMenu {
 
   // LauncherContextMenu:
   void GetMenuModel(GetMenuModelCallback callback) override;
-  void BuildMenu(std::unique_ptr<ui::SimpleMenuModel> menu_model,
-                 GetMenuModelCallback callback) override;
   bool IsCommandIdEnabled(int command_id) const override;
   void ExecuteCommand(int command_id, int event_flags) override;
 

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

@@ -68,12 +68,6 @@ ExtensionLauncherContextMenu::~ExtensionLauncherContextMenu() = default;
 
 void ExtensionLauncherContextMenu::GetMenuModel(GetMenuModelCallback callback) {
   auto menu_model = std::make_unique<ui::SimpleMenuModel>(this);
-  BuildMenu(std::move(menu_model), std::move(callback));
-}
-
-void ExtensionLauncherContextMenu::BuildMenu(
-    std::unique_ptr<ui::SimpleMenuModel> menu_model,
-    GetMenuModelCallback callback) {
   Profile* profile = controller()->profile();
   const std::string app_id = item().id.app_id;
 

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

@@ -25,8 +25,6 @@ class ExtensionLauncherContextMenu : public LauncherContextMenu {
 
   // LauncherContextMenu overrides:
   void GetMenuModel(GetMenuModelCallback callback) override;
-  void BuildMenu(std::unique_ptr<ui::SimpleMenuModel> menu_model,
-                 GetMenuModelCallback callback) override;
 
   // ui::SimpleMenuModel::Delegate overrides:
   bool IsCommandIdChecked(int command_id) const override;

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

@@ -24,12 +24,6 @@ InternalAppShelfContextMenu::InternalAppShelfContextMenu(
 
 void InternalAppShelfContextMenu::GetMenuModel(GetMenuModelCallback callback) {
   auto menu_model = std::make_unique<ui::SimpleMenuModel>(this);
-  BuildMenu(std::move(menu_model), std::move(callback));
-}
-
-void InternalAppShelfContextMenu::BuildMenu(
-    std::unique_ptr<ui::SimpleMenuModel> menu_model,
-    GetMenuModelCallback callback) {
   const bool app_is_open = controller()->IsOpen(item().id);
   if (!app_is_open) {
     AddContextMenuOption(menu_model.get(), ash::MENU_OPEN_NEW,

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

@@ -18,8 +18,6 @@ class InternalAppShelfContextMenu : public LauncherContextMenu {
 
   // LauncherContextMenu:
   void GetMenuModel(GetMenuModelCallback callback) override;
-  void BuildMenu(std::unique_ptr<ui::SimpleMenuModel> menu_model,
-                 GetMenuModelCallback callback) override;
   void ExecuteCommand(int command_id, int event_flags) override;
 
  private:

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

@@ -28,8 +28,6 @@ class LauncherContextMenu : public ui::SimpleMenuModel::Delegate {
   using GetMenuModelCallback =
       base::OnceCallback<void(std::unique_ptr<ui::SimpleMenuModel>)>;
   virtual void GetMenuModel(GetMenuModelCallback callback) = 0;
-  virtual void BuildMenu(std::unique_ptr<ui::SimpleMenuModel> menu_model,
-                         GetMenuModelCallback callback) = 0;
 
   // ui::SimpleMenuModel::Delegate overrides:
   bool IsCommandIdChecked(int command_id) const override;