Chromium Code Reviews| Index: ash/common/shelf/wm_shelf.h |
| diff --git a/ash/common/shelf/wm_shelf.h b/ash/common/shelf/wm_shelf.h |
| index ee88e94b1525b44d9b1dd9bcec0e70e3596a4705..f63148baf201dcd1ae43c52472c44decf580c036 100644 |
| --- a/ash/common/shelf/wm_shelf.h |
| +++ b/ash/common/shelf/wm_shelf.h |
| @@ -162,13 +162,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; |
|
James Cook
2017/02/14 01:38:03
This makes me a bit nervous. It's probably fine, b
msw
2017/02/14 05:13:18
Done. I had already run OOBE with an existing acco
|
| // 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. |