chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc - Issue 2747983002: arc: Fix crash on deferred app launch.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2747983002: arc: Fix crash on deferred app launch. (Closed)

Patch Set: refactored 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') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 =