ash/shelf/shelf.cc - Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common.

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

Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move ShelfLockingManager test access to Shelf. Created 4 years, 5 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/shelf/shelf.cc

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

index 0392685c2a687b82e156bd82b0ca67f246ee5f00..5e0992a0b9dc7586b0c894900296014fb1124cd4 100644

--- a/ash/shelf/shelf.cc

+++ b/ash/shelf/shelf.cc

@@ -47,7 +47,7 @@ Shelf::Shelf(ShelfModel* shelf_model,

wm_shelf_(wm_shelf),

shelf_widget_(shelf_widget),

shelf_view_(new ShelfView(shelf_model, delegate_, wm_shelf, this)),

- shelf_locking_manager_(this) {

+ shelf_locking_manager_(wm_shelf) {

DCHECK(wm_shelf_);

shelf_view_->Init();

shelf_widget_->GetContentsView()->AddChildView(shelf_view_);