Remove LauncherItemController::type; use ShelfItems::type.

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 "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
@@ skipping 51 matching lines @@
 }
 
 ash::ShelfID ChromeLauncherControllerMus::CreateAppLauncherItem(
     LauncherItemController* controller,
     const std::string& app_id,
     ash::ShelfItemStatus status) {
   NOTIMPLEMENTED();
   return ash::TYPE_UNDEFINED;
 }
 
+const ash::ShelfItem& ChromeLauncherControllerMus::GetItem(
+    ash::ShelfID id) const {
+  NOTIMPLEMENTED();
+  return fake_item_;
+}
+
+void ChromeLauncherControllerMus::SetItemType(ash::ShelfID id,
+                                              ash::ShelfItemType type) {
+  NOTIMPLEMENTED();
+}
+
 void ChromeLauncherControllerMus::SetItemStatus(ash::ShelfID id,
                                                 ash::ShelfItemStatus status) {
   NOTIMPLEMENTED();
 }
 
 void ChromeLauncherControllerMus::SetItemController(
     ash::ShelfID id,
     LauncherItemController* controller) {
   NOTIMPLEMENTED();
 }
@@ skipping 116 matching lines @@
 }
 
 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,
-                                                   int index) {
+                                                   int window_index) {
   NOTIMPLEMENTED();
 }
 
 bool ChromeLauncherControllerMus::IsWebContentHandledByApplication(
     content::WebContents* web_contents,
     const std::string& app_id) {
   NOTIMPLEMENTED();
   return false;
 }
 
@@ skipping 85 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);
     }
   }
 }