| Index: ash/common/wm/workspace/phantom_window_controller.h
|
| diff --git a/ash/common/wm/workspace/phantom_window_controller.h b/ash/common/wm/workspace/phantom_window_controller.h
|
| index 1970e868db074f6f55b3b3ae828d8a36ce106e47..6ac7da2bcc98bccf6b7803471cd6117617940998 100644
|
| --- a/ash/common/wm/workspace/phantom_window_controller.h
|
| +++ b/ash/common/wm/workspace/phantom_window_controller.h
|
| @@ -16,16 +16,15 @@ 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(wm::WmWindow* window);
|
| + explicit PhantomWindowController(WmWindow* window);
|
|
|
| // Hides the phantom window without any animation.
|
| ~PhantomWindowController();
|
| @@ -37,11 +36,11 @@ class ASH_EXPORT PhantomWindowController {
|
| // Creates, shows and returns a phantom widget at |bounds|
|
| // with kShellWindowId_ShelfContainer in |root_window| as a parent.
|
| std::unique_ptr<views::Widget> CreatePhantomWidget(
|
| - wm::WmWindow* root_window,
|
| + WmWindow* root_window,
|
| const gfx::Rect& bounds_in_screen);
|
|
|
| // Window that the phantom window is stacked above.
|
| - wm::WmWindow* window_;
|
| + WmWindow* window_;
|
|
|
| // Target bounds (including the shadows if any) of the animation in screen
|
| // coordinates.
|
|
|