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

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

Index: chrome/browser/ui/ash/launcher/launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
index 53605f7155237efc7cf73848dfdfa3495c41076b..aba8fe133a5676e6fe6f7455633ea97ff44e7f33 100644
--- a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc
@@ -8,12 +8,10 @@
 #include "chrome/common/extensions/extension_constants.h"
 
 LauncherItemController::LauncherItemController(
-    Type type,
     const std::string& app_id,
     const std::string& launch_id,
     ChromeLauncherController* launcher_controller)
-    : type_(type),
-      app_id_(app_id),
+    : app_id_(app_id),
       launch_id_(launch_id),
       shelf_id_(0),
       launcher_controller_(launcher_controller),
@@ -21,19 +19,3 @@ LauncherItemController::LauncherItemController(
       image_set_by_controller_(false) {}
 
 LauncherItemController::~LauncherItemController() {}
-
-ash::ShelfItemType LauncherItemController::GetShelfItemType() const {
-  if (extension_misc::IsImeMenuExtensionId(app_id_))

[James Cook, 2016/12/02 19:27:18]

Can you file a bug about removing this method? I think that the last remaining
caller (in ChromeNativeAppWindowViews) isn't relevant anymore now that the menu
isn't a panel.

[msw, 2016/12/02 19:37:57]

It's also used in
chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc, but is also
likely invalid, since it's no longer a launcher item... Filed
http://crbug.com/670825

-    return ash::TYPE_IME_MENU;
-
-  switch (type_) {
-    case LauncherItemController::TYPE_SHORTCUT:
-      return ash::TYPE_APP_SHORTCUT;
-    case LauncherItemController::TYPE_APP:
-      return ash::TYPE_APP;
-    case LauncherItemController::TYPE_APP_PANEL:
-      return ash::TYPE_APP_PANEL;
-  }
-  NOTREACHED();
-  return ash::TYPE_APP_SHORTCUT;
-}