| Index: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
|
| index c56c50ee93e27fd2dce29d2e332b22f19604dc3b..965cc8429189feb4319a98180e0e20c3d16bffec 100644
|
| --- a/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc
|
| @@ -195,15 +195,9 @@ void ArcAppDeferredLauncherController::RegisterDeferredLaunch(
|
| 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(
|
|
|