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

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 "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
@@ skipping 32 matching lines @@
   SkBitmap bmp = skia::ImageOperations::Resize(
       *app_window->app_icon().ToSkBitmap(), skia::ImageOperations::RESIZE_BEST,
       kAppListIconSize, kAppListIconSize);
   return gfx::Image(gfx::ImageSkia::CreateFrom1xBitmap(bmp));
 }
 
 }  // namespace
 
 ExtensionAppWindowLauncherItemController::
     ExtensionAppWindowLauncherItemController(
-        Type type,
         const std::string& app_id,
         const std::string& launch_id,
         ChromeLauncherController* controller)
-    : AppWindowLauncherItemController(type, app_id, launch_id, controller) {
-  DCHECK_NE(TYPE_APP_PANEL, type);
-}
+    : AppWindowLauncherItemController(app_id, launch_id, controller) {}
 
 ExtensionAppWindowLauncherItemController::
     ~ExtensionAppWindowLauncherItemController() {}
 
 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());
@@ skipping 44 matching lines @@
   if (windows().empty())
     return kNoAction;
   return AppWindowLauncherItemController::ItemSelected(event);
 }
 
 ash::ShelfMenuModel*
 ExtensionAppWindowLauncherItemController::CreateApplicationMenu(
     int event_flags) {
   return new LauncherApplicationMenuItemModel(GetApplicationList(event_flags));
 }