chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc - Issue 2750463009: mash: Fix ShelfItem mojo struct; add enums and traits.

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/chrome_launcher_controller_impl.cc

Issue 2750463009: mash: Fix ShelfItem mojo struct; add enums and traits. (Closed)

Patch Set: Address comment. 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:

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

index 5673dcb512a61a64e11dfec0acbc13e660d014a6..d64ba1567eac42625f4b7d8c15b05d74b2cdaee1 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

@@ -1386,7 +1386,7 @@ void ChromeLauncherControllerImpl::CloseWindowedAppsFromRemovedExtension(

void ChromeLauncherControllerImpl::SetShelfItemDelegate(

ash::ShelfID id,

ash::mojom::ShelfItemDelegate* item_delegate) {

- DCHECK_GT(id, 0);

+ DCHECK_NE(id, ash::kInvalidShelfID);

DCHECK(item_delegate);

model_->SetShelfItemDelegate(

id, base::WrapUnique<ash::mojom::ShelfItemDelegate>(item_delegate));