mash: Cleanup ash shelf application menu code.

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

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h"
 
 #include <stddef.h>
 
+#include "ash/public/cpp/shelf_application_menu_item.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_playstore_shortcut_launcher_item_controller.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
-#include "chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 88 matching lines @@
       // special time out.
       if (!AllowNextLaunchAttempt())
         return kNoAction;
     }
     Launch(source, ui::EF_NONE);
     return kNewWindowCreated;
   }
   return ActivateContent(content);
 }
 
+ash::ShelfItemDelegate::PerformedAction
+AppShortcutLauncherItemController::ItemSelected(const ui::Event& event) {
+  // In case of a keyboard event, we were called by a hotkey. In that case we
+  // activate the next item in line if an item of our list is already active.
+  if (event.type() == ui::ET_KEY_RELEASED && AdvanceToNextApp())
+    return kExistingWindowActivated;
+  return Activate(ash::LAUNCH_FROM_UNKNOWN);
+}
+
+ash::ShelfApplicationMenuItems
+AppShortcutLauncherItemController::GetAppMenuItems(int event_flags) {
+  ash::ShelfApplicationMenuItems items;
+  std::vector<content::WebContents*> content_list = GetRunningApplications();
+  for (size_t i = 0; i < content_list.size(); i++) {
+    content::WebContents* web_contents = content_list[i];
+    gfx::Image app_icon = launcher_controller()->GetAppListIcon(web_contents);
+    base::string16 title = launcher_controller()->GetAppListTitle(web_contents);
+    items.push_back(base::MakeUnique<ChromeLauncherAppMenuItemTab>(
+        title, &app_icon, web_contents));
+  }
+  return items;
+}
+
 void AppShortcutLauncherItemController::Close() {
   // Close all running 'programs' of this type.
   std::vector<content::WebContents*> content =
       launcher_controller()->GetV1ApplicationsFromAppId(app_id());
   for (size_t i = 0; i < content.size(); i++) {
     Browser* browser = chrome::FindBrowserWithWebContents(content[i]);
     if (!browser || !IsBrowserFromActiveUser(browser))
       continue;
     TabStripModel* tab_strip = browser->tab_strip_model();
     int index = tab_strip->GetIndexOfWebContents(content[i]);
     DCHECK(index != TabStripModel::kNoTab);
     tab_strip->CloseWebContentsAt(index, TabStripModel::CLOSE_NONE);
   }
 }
 
-ChromeLauncherAppMenuItems
-AppShortcutLauncherItemController::GetApplicationList(int event_flags) {
-  ChromeLauncherAppMenuItems items;
-  // Add the application name to the menu.
-  base::string16 app_title = LauncherControllerHelper::GetAppTitle(
-      launcher_controller()->profile(), app_id());
-  items.push_back(
-      base::MakeUnique<ChromeLauncherAppMenuItem>(app_title, nullptr, false));
-
-  std::vector<content::WebContents*> content_list = GetRunningApplications();
-
-  for (size_t i = 0; i < content_list.size(); i++) {
-    content::WebContents* web_contents = content_list[i];
-    // Get the icon.
-    gfx::Image app_icon = launcher_controller()->GetAppListIcon(web_contents);
-    base::string16 title = launcher_controller()->GetAppListTitle(web_contents);
-    items.push_back(base::MakeUnique<ChromeLauncherAppMenuItemTab>(
-        title, &app_icon, web_contents, i == 0));
-  }
-  return items;
-}
-
 std::vector<content::WebContents*>
 AppShortcutLauncherItemController::GetRunningApplications() {
   std::vector<content::WebContents*> items;
 
   URLPattern refocus_pattern(URLPattern::SCHEME_ALL);
   refocus_pattern.SetMatchAllURLs(true);
 
   if (!refocus_url_.is_empty()) {
     refocus_pattern.SetMatchAllURLs(false);
     refocus_pattern.Parse(refocus_url_.spec());
@@ skipping 13 matching lines @@
     for (int index = 0; index < tab_strip->count(); index++) {
       content::WebContents* web_contents = tab_strip->GetWebContentsAt(index);
       if (WebContentMatchesApp(
               extension, refocus_pattern, web_contents, browser))
         items.push_back(web_contents);
     }
   }
   return items;
 }
 
-ash::ShelfItemDelegate::PerformedAction
-AppShortcutLauncherItemController::ItemSelected(const ui::Event& event) {
-  // In case of a keyboard event, we were called by a hotkey. In that case we
-  // activate the next item in line if an item of our list is already active.
-  if (event.type() == ui::ET_KEY_RELEASED) {
-    if (AdvanceToNextApp())
-      return kExistingWindowActivated;
-  }
-  return Activate(ash::LAUNCH_FROM_UNKNOWN);
-}
-
-ui::SimpleMenuModel* AppShortcutLauncherItemController::CreateApplicationMenu(
-    int event_flags) {
-  return new LauncherApplicationMenuItemModel(GetApplicationList(event_flags));
-}
-
 content::WebContents* AppShortcutLauncherItemController::GetLRUApplication() {
   URLPattern refocus_pattern(URLPattern::SCHEME_ALL);
   refocus_pattern.SetMatchAllURLs(true);
 
   if (!refocus_url_.is_empty()) {
     refocus_pattern.SetMatchAllURLs(false);
     refocus_pattern.Parse(refocus_url_.spec());
   }
 
   const Extension* extension =
@@ skipping 126 matching lines @@
 
 bool AppShortcutLauncherItemController::AllowNextLaunchAttempt() {
   if (last_launch_attempt_.is_null() ||
       last_launch_attempt_ + base::TimeDelta::FromMilliseconds(
           kClickSuppressionInMS) < base::Time::Now()) {
     last_launch_attempt_ = base::Time::Now();
     return true;
   }
   return false;
 }