chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc - Issue 2878133002: mash: Serialize ShelfIDs for property conversion and transport.

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 2878133002: mash: Serialize ShelfIDs for property conversion and transport. (Closed)

Patch Set: Address comments. 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 | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_window_launcher_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 453d3cff02801d6084a26d1931bd600cf3b21b9b..cc67d20b6e4d3984fc54e24ff56a99ba629b5f3f 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 (item == nullptr) {

+ if (!item) {

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

} else {

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