ash/common/shelf/shelf_window_watcher.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: ash/common/shelf/shelf_window_watcher.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: ash/common/shelf/shelf_window_watcher.cc

diff --git a/ash/common/shelf/shelf_window_watcher.cc b/ash/common/shelf/shelf_window_watcher.cc

index adb20b81b635515c19b7420a76632f2a55cd2573..c8a8b482f0ce5abd0b8b8da1945a1656d71bd1d1 100644

--- a/ash/common/shelf/shelf_window_watcher.cc

+++ b/ash/common/shelf/shelf_window_watcher.cc

@@ -172,7 +172,7 @@ void ShelfWindowWatcher::AddShelfItem(aura::Window* window) {

void ShelfWindowWatcher::RemoveShelfItem(aura::Window* window) {

user_windows_with_items_.erase(window);

- int shelf_id = window->GetProperty(kShelfIDKey);

+ ShelfID shelf_id = window->GetProperty(kShelfIDKey);

DCHECK_NE(shelf_id, kInvalidShelfID);

int index = model_->ItemIndexByID(shelf_id);

DCHECK_GE(index, 0);