Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2098)

Unified Diff: ash/common/shelf/wm_shelf.h

Issue 2688353005: Fix shelf alignment and auto-hide initialization. (Closed)
Patch Set: Fix mash_unittests by installing a TestShellDelegate. Created 3 years, 10 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/common/shelf/wm_shelf.cc » ('j') | ash/mus/window_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « no previous file | ash/common/shelf/wm_shelf.cc » ('j') | ash/mus/window_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698