Index: ash/aura/wm_shelf_aura.h |
diff --git a/ash/aura/wm_shelf_aura.h b/ash/aura/wm_shelf_aura.h |
index b86e3d67fd9474a42d18d4e49c1bb559838a6115..d796f46586e30856251750833117fe080c3e8ba5 100644 |
--- a/ash/aura/wm_shelf_aura.h |
+++ b/ash/aura/wm_shelf_aura.h |
@@ -43,9 +43,11 @@ class ASH_EXPORT WmShelfAura : public WmShelf, |
void SetAlignment(ShelfAlignment alignment) override; |
ShelfAutoHideBehavior GetAutoHideBehavior() const override; |
void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override; |
+ ShelfAutoHideState GetAutoHideState() const override; |
ShelfBackgroundType GetBackgroundType() const override; |
void UpdateVisibilityState() override; |
ShelfVisibilityState GetVisibilityState() const override; |
+ gfx::Rect GetUserWorkAreaBounds() const override; |
void UpdateIconPositionForWindow(WmWindow* window) override; |
gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override; |
void AddObserver(WmShelfObserver* observer) override; |
@@ -53,6 +55,7 @@ class ASH_EXPORT WmShelfAura : public WmShelf, |
// ShelfLayoutManagerObserver: |
void WillDeleteShelfLayoutManager() override; |
+ void OnAutoHideStateChanged(ShelfAutoHideState new_state) override; |
void OnBackgroundUpdated(ShelfBackgroundType background_type, |
BackgroundAnimatorChangeType change_type) override; |
void WillChangeVisibilityState(ShelfVisibilityState new_state) override; |
@@ -60,7 +63,7 @@ class ASH_EXPORT WmShelfAura : public WmShelf, |
// ShelfIconObserver: |
void OnShelfIconPositionsChanged() override; |
- // May be null during login. |
+ // May be null during login and during initialization of a secondary display. |
Shelf* shelf_ = nullptr; |
// Cached separately because it may be destroyed before |shelf_|. |