mash: Cleanup ash shelf application menu code.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.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/chrome_launcher_controller_mus.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 163 matching lines @@
 void ChromeLauncherControllerMus::ActiveUserChanged(
     const std::string& user_email) {
   NOTIMPLEMENTED();
 }
 
 void ChromeLauncherControllerMus::AdditionalUserAddedToSession(
     Profile* profile) {
   NOTIMPLEMENTED();
 }
 
-ChromeLauncherAppMenuItems ChromeLauncherControllerMus::GetApplicationList(
+ash::ShelfAppMenuItemList ChromeLauncherControllerMus::GetAppMenuItems(
     const ash::ShelfItem& item,
     int event_flags) {
   NOTIMPLEMENTED();
-  return ChromeLauncherAppMenuItems();
+  return ash::ShelfAppMenuItemList();
 }
 
 std::vector<content::WebContents*>
 ChromeLauncherControllerMus::GetV1ApplicationsFromAppId(
     const std::string& app_id) {
   NOTIMPLEMENTED();
   return std::vector<content::WebContents*>();
 }
 
 void ChromeLauncherControllerMus::ActivateShellApp(const std::string& app_id,
@@ skipping 98 matching lines @@
     app_id_to_item_delegate_.insert(
         std::make_pair(app_id, std::move(delegate)));
 
     AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
     if (app_icon_loader) {
       app_icon_loader->FetchImage(app_id);
       app_icon_loader->UpdateImage(app_id);
     }
   }
 }