| Index: ash/wm/always_on_top_controller.h
|
| diff --git a/ash/wm/always_on_top_controller.h b/ash/wm/always_on_top_controller.h
|
| index 4f33eeeede88110c34b221b37a5a2011464a3add..44a26ea2669116dc5cc786a9a56b2b5e58765000 100644
|
| --- a/ash/wm/always_on_top_controller.h
|
| +++ b/ash/wm/always_on_top_controller.h
|
| @@ -13,7 +13,6 @@
|
|
|
| namespace ash {
|
|
|
| -class WmWindow;
|
| class WorkspaceLayoutManager;
|
|
|
| // AlwaysOnTopController puts window into proper containers based on its
|
| @@ -22,11 +21,11 @@ class WorkspaceLayoutManager;
|
| // |always_on_top_container_|.
|
| class ASH_EXPORT AlwaysOnTopController : public aura::WindowObserver {
|
| public:
|
| - explicit AlwaysOnTopController(WmWindow* viewport);
|
| + explicit AlwaysOnTopController(aura::Window* viewport);
|
| ~AlwaysOnTopController() override;
|
|
|
| // Gets container for given |window| based on its "AlwaysOnTop" property.
|
| - WmWindow* GetContainer(WmWindow* window) const;
|
| + aura::Window* GetContainer(aura::Window* window) const;
|
|
|
| WorkspaceLayoutManager* GetLayoutManager() const;
|
|
|
| @@ -41,7 +40,7 @@ class ASH_EXPORT AlwaysOnTopController : public aura::WindowObserver {
|
| intptr_t old) override;
|
| void OnWindowDestroying(aura::Window* window) override;
|
|
|
| - WmWindow* always_on_top_container_;
|
| + aura::Window* always_on_top_container_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AlwaysOnTopController);
|
| };
|
|
|