Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc

Issue 2758873002: [Merge M58] arc: Fix crash on deferred app launch. (Closed)
Patch Set: resolve merge conflicts Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0cde6b00b51d9bba15648676c8455199e1e771fd..57f6d0c1a2c96b3a36036a89d31a1dbb86d79207 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
@@ -197,9 +197,9 @@ void ArcAppDeferredLauncherController::RegisterDeferredLaunch(
ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
const ash::ShelfID shelf_id = owner_->GetShelfIDForAppID(shelf_app_id);
- // We are allowed to apply new deferred controller only over shortcut.
+ // We are allowed to apply new deferred controller only over non-active items.
const ash::ShelfItem* item = owner_->GetItem(shelf_id);
- if (item && item->type != ash::TYPE_APP_SHORTCUT)
+ if (item && item->status != ash::STATUS_CLOSED)
return;
ArcAppDeferredLauncherItemController* controller =
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698