| Index: ash/wm/workspace/phantom_window_controller.h
|
| diff --git a/ash/wm/workspace/phantom_window_controller.h b/ash/wm/workspace/phantom_window_controller.h
|
| index 6bc320aab322ae2720e8d72effdf811d0c1abbfc..8e1983ba3a916dff7ba127cce5e1945437eec8c9 100644
|
| --- a/ash/wm/workspace/phantom_window_controller.h
|
| +++ b/ash/wm/workspace/phantom_window_controller.h
|
| @@ -11,40 +11,37 @@
|
| #include "base/macros.h"
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| -namespace aura {
|
| -class Window;
|
| -}
|
| -
|
| namespace views {
|
| class Widget;
|
| }
|
|
|
| namespace ash {
|
| +namespace wm {
|
| +class WmWindow;
|
| +}
|
|
|
| // PhantomWindowController is responsible for showing a phantom representation
|
| // of a window. It's used to show a preview of how snapping or docking a window
|
| // will affect the window's bounds.
|
| class ASH_EXPORT PhantomWindowController {
|
| public:
|
| - explicit PhantomWindowController(aura::Window* window);
|
| + explicit PhantomWindowController(wm::WmWindow* window);
|
|
|
| // Hides the phantom window without any animation.
|
| - virtual ~PhantomWindowController();
|
| + ~PhantomWindowController();
|
|
|
| // Shows the phantom window and animates shrinking it to |bounds_in_screen|.
|
| void Show(const gfx::Rect& bounds_in_screen);
|
|
|
| private:
|
| - friend class PhantomWindowControllerTest;
|
| -
|
| // Creates, shows and returns a phantom widget at |bounds|
|
| // with kShellWindowId_ShelfContainer in |root_window| as a parent.
|
| std::unique_ptr<views::Widget> CreatePhantomWidget(
|
| - aura::Window* root_window,
|
| + wm::WmWindow* root_window,
|
| const gfx::Rect& bounds_in_screen);
|
|
|
| // Window that the phantom window is stacked above.
|
| - aura::Window* window_;
|
| + wm::WmWindow* window_;
|
|
|
| // Target bounds (including the shadows if any) of the animation in screen
|
| // coordinates.
|
|
|