| Index: ash/common/shelf/wm_shelf.h
|
| diff --git a/ash/common/shelf/wm_shelf.h b/ash/common/shelf/wm_shelf.h
|
| index 5e9aed6a7b8fef86aa711a3fff249205a98a408b..b2e858a7976c7a7be42cc8a369fb03be4730c439 100644
|
| --- a/ash/common/shelf/wm_shelf.h
|
| +++ b/ash/common/shelf/wm_shelf.h
|
| @@ -163,13 +163,13 @@ class ASH_EXPORT WmShelf : public ShelfLayoutManagerObserver {
|
| // hierarchy. Null before login and in secondary display init.
|
| ShelfView* shelf_view_ = nullptr;
|
|
|
| + // These initial values hide the shelf until user preferences are available.
|
| ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM_LOCKED;
|
| + ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_ALWAYS_HIDDEN;
|
|
|
| // Sets shelf alignment to bottom during login and screen lock.
|
| std::unique_ptr<ShelfLockingManager> shelf_locking_manager_;
|
|
|
| - ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
|
| -
|
| base::ObserverList<WmShelfObserver> observers_;
|
|
|
| // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide.
|
|
|