chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc - Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings.

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 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)

Patch Set: Fix struct traits typo. Created 3 years, 7 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 | « chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.cc » ('j') | no next file with comments »
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 6ddf01caaa7e09890b0b37ceded698efc59c76f0..ea088d259a95216c6da5764382af20845fef2a4c 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

@@ -208,7 +208,7 @@ void ArcAppDeferredLauncherController::RegisterDeferredLaunch(

base::MakeUnique<ArcAppDeferredLauncherItemController>(

shelf_app_id, event_flags, weak_ptr_factory_.GetWeakPtr());

ArcAppDeferredLauncherItemController* item_controller = controller.get();

- if (shelf_id == 0) {

+ if (shelf_id.IsNull()) {

owner_->CreateAppLauncherItem(std::move(controller), ash::STATUS_RUNNING);

} else {

owner_->shelf_model()->SetShelfItemDelegate(shelf_id,