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

chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_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/arc_app_deferred_launcher_controller.h"
 
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h"
@@ skipping 174 matching lines @@
   DCHECK(arc_session_manager);
   DCHECK(arc_session_manager->state() !=
          arc::ArcSessionManager::State::STOPPED);
   DCHECK(arc_session_manager->state() !=
          arc::ArcSessionManager::State::NOT_INITIALIZED);
 
   const std::string shelf_app_id =
       ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
   const ash::ShelfID shelf_id = owner_->GetShelfIDForAppID(shelf_app_id);
 
-  if (shelf_id) {
-    LauncherItemController* controller =
-        owner_->GetLauncherItemController(shelf_id);
-    if (controller &&
-        controller->type() != LauncherItemController::TYPE_SHORTCUT) {
-      // We are allowed to apply new deferred controller only over shortcut.
-      return;
-    }
-  }
+  // We are allowed to apply new deferred controller only over shortcut.
+  if (shelf_id && owner_->GetItem(shelf_id).type != ash::TYPE_APP_SHORTCUT)
+    return;
 
   ArcAppDeferredLauncherItemController* controller =
       new ArcAppDeferredLauncherItemController(shelf_app_id, owner_,
                                                weak_ptr_factory_.GetWeakPtr());
   if (shelf_id == 0) {
     owner_->CreateAppLauncherItem(controller, shelf_app_id,
                                   ash::STATUS_RUNNING);
   } else {
     owner_->SetItemController(shelf_id, controller);
     owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
   }
 
   if (app_controller_map_.empty())
     RegisterNextUpdate();
 
   app_controller_map_[shelf_app_id] = controller;
 }