mash: Cleanup ash shelf application menu code.

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

 // Copyright 2016 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/extension_app_window_launcher_item_controller.h"
 
 #include "ash/common/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
-#include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "skia/ext/image_operations.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 38 matching lines @@
 
 void ExtensionAppWindowLauncherItemController::AddAppWindow(
     extensions::AppWindow* app_window) {
   DCHECK(!app_window->window_type_is_panel());
   DCHECK(window_to_app_window_.find(app_window->GetBaseWindow()) ==
          window_to_app_window_.end());
   AddWindow(app_window->GetBaseWindow());
   window_to_app_window_[app_window->GetBaseWindow()] = app_window;
 }
 
-void ExtensionAppWindowLauncherItemController::OnWindowRemoved(
-    ui::BaseWindow* window) {
-  WindowToAppWindow::iterator it = window_to_app_window_.find(window);
-  if (it == window_to_app_window_.end()) {
-    NOTREACHED();
-    return;
-  }
-
-  window_to_app_window_.erase(it);
-}
-
-ChromeLauncherAppMenuItems
-ExtensionAppWindowLauncherItemController::GetApplicationList(int event_flags) {
-  ChromeLauncherAppMenuItems items =
-      AppWindowLauncherItemController::GetApplicationList(event_flags);
+ash::ShelfAppMenuItemList
+ExtensionAppWindowLauncherItemController::GetAppMenuItems(int event_flags) {
+  ash::ShelfAppMenuItemList items;
   int index = 0;
   for (const auto* window : windows()) {
     extensions::AppWindow* app_window = window_to_app_window_[window];
     DCHECK(app_window);
 
     // If the app's web contents provides a favicon, use it. Otherwise, use a
     // scaled down app icon.
     favicon::FaviconDriver* favicon_driver =
         favicon::ContentFaviconDriver::FromWebContents(
             app_window->web_contents());
     gfx::Image result = favicon_driver->GetFavicon();
     if (result.IsEmpty())
       result = GetAppListIcon(app_window);
 
     items.push_back(base::MakeUnique<ChromeLauncherAppMenuItemV2App>(
         app_window->GetTitle(),
         &result,  // Will be copied
-        app_id(), launcher_controller(), index,
-        index == 0 /* has_leading_separator */));
+        app_id(), launcher_controller(), index));
     ++index;
   }
   return items;
 }
+
+void ExtensionAppWindowLauncherItemController::OnWindowRemoved(
+    ui::BaseWindow* window) {
+  WindowToAppWindow::iterator it = window_to_app_window_.find(window);
+  if (it == window_to_app_window_.end()) {
+    NOTREACHED();
+    return;
+  }
+
+  window_to_app_window_.erase(it);
+}