| Index: ash/mus/bridge/wm_shelf_mus.h
|
| diff --git a/ash/mus/bridge/wm_shelf_mus.h b/ash/mus/bridge/wm_shelf_mus.h
|
| index 5db4d2b94b929bbdc498e2bc80cc5e09e454c1ed..c3571e98ac9d02e7f953b83dc463059db1a415d5 100644
|
| --- a/ash/mus/bridge/wm_shelf_mus.h
|
| +++ b/ash/mus/bridge/wm_shelf_mus.h
|
| @@ -7,13 +7,10 @@
|
|
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "base/macros.h"
|
| -#include "base/observer_list.h"
|
| -
|
| -namespace views {
|
| -class Widget;
|
| -}
|
|
|
| namespace ash {
|
| +
|
| +class ShelfWidget;
|
| class WmRootWindowController;
|
|
|
| namespace mus {
|
| @@ -24,37 +21,9 @@ class WmShelfMus : public WmShelf {
|
| WmShelfMus(WmRootWindowController* root_window_controller);
|
| ~WmShelfMus() override;
|
|
|
| - // WmShelf:
|
| - WmWindow* GetWindow() override;
|
| - ShelfAlignment GetAlignment() const override;
|
| - void SetAlignment(ShelfAlignment alignment) override;
|
| - ShelfAutoHideBehavior GetAutoHideBehavior() const override;
|
| - void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) override;
|
| - ShelfAutoHideState GetAutoHideState() const override;
|
| - void UpdateAutoHideState() override;
|
| - ShelfBackgroundType GetBackgroundType() const override;
|
| - WmDimmerView* CreateDimmerView(bool disable_animations_for_test) override;
|
| - bool IsDimmed() const override;
|
| - void SchedulePaint() override;
|
| - bool IsVisible() const override;
|
| - void UpdateVisibilityState() override;
|
| - ShelfVisibilityState GetVisibilityState() const override;
|
| - gfx::Rect GetIdealBounds() override;
|
| - gfx::Rect GetUserWorkAreaBounds() const override;
|
| - void UpdateIconPositionForWindow(WmWindow* window) override;
|
| - gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
|
| - bool ProcessGestureEvent(const ui::GestureEvent& event) override;
|
| - void AddObserver(WmShelfObserver* observer) override;
|
| - void RemoveObserver(WmShelfObserver* observer) override;
|
| - void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) override;
|
| - ShelfLockingManager* GetShelfLockingManagerForTesting() override;
|
| - ShelfView* GetShelfViewForTesting() override;
|
| -
|
| private:
|
| - base::ObserverList<WmShelfObserver> observers_;
|
| -
|
| - // Owned by native widget.
|
| - views::Widget* shelf_widget_;
|
| + // The shelf widget for this shelf.
|
| + std::unique_ptr<ShelfWidget> shelf_widget_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
|
| };
|
|
|