| 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 163089ae51a32aef0598acdd41b28ae143d533f0..5db4d2b94b929bbdc498e2bc80cc5e09e454c1ed 100644
|
| --- a/ash/mus/bridge/wm_shelf_mus.h
|
| +++ b/ash/mus/bridge/wm_shelf_mus.h
|
| @@ -5,23 +5,23 @@
|
| #ifndef ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
|
| #define ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
|
|
|
| -#include <stdint.h>
|
| -
|
| -#include <vector>
|
| -
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "base/macros.h"
|
| #include "base/observer_list.h"
|
|
|
| +namespace views {
|
| +class Widget;
|
| +}
|
| +
|
| namespace ash {
|
| -namespace mus {
|
| +class WmRootWindowController;
|
|
|
| -class ShelfLayoutManager;
|
| +namespace mus {
|
|
|
| // WmShelf implementation for mus.
|
| class WmShelfMus : public WmShelf {
|
| public:
|
| - explicit WmShelfMus(ShelfLayoutManager* shelf_layout_manager);
|
| + WmShelfMus(WmRootWindowController* root_window_controller);
|
| ~WmShelfMus() override;
|
|
|
| // WmShelf:
|
| @@ -53,7 +53,8 @@ class WmShelfMus : public WmShelf {
|
| private:
|
| base::ObserverList<WmShelfObserver> observers_;
|
|
|
| - ShelfLayoutManager* shelf_layout_manager_;
|
| + // Owned by native widget.
|
| + views::Widget* shelf_widget_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
|
| };
|
|
|