ash/shelf/shelf_locking_manager.cc - Issue 2889673002: chromeos: Refactor shelf to create ShelfView earlier in startup

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_locking_manager.cc

Issue 2889673002: chromeos: Refactor shelf to create ShelfView earlier in startup (Closed)

Patch Set: Move ShelfView to initializer list 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:

Index: ash/shelf/shelf_locking_manager.cc

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

index 0a6a037ffa4d500007085b13131a3934b2cb48c9..cb221d4bb951ffa45d8c73b13eda4263dfbd8221 100644

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

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

@@ -13,7 +13,7 @@ namespace ash {

ShelfLockingManager::ShelfLockingManager(WmShelf* shelf)

: shelf_(shelf),

- stored_alignment_(shelf->GetAlignment()),

+ stored_alignment_(SHELF_ALIGNMENT_BOTTOM_LOCKED),

James Cook 2017/05/16 21:32:35 This is to avoid reading out of a partially-constr

msw 2017/05/16 22:42:00 Acknowledged.

scoped_session_observer_(this) {

DCHECK(shelf_);

ShellPort::Get()->AddLockStateObserver(this);