Chromium Code Reviews| Index: ash/wm/workspace/workspace_window_resizer.h |
| diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h |
| index 018a7ccf6adf4b5f0621101d846743cfaec94320..d85151c1a42c117dbb6c486fc21eb72487a9dc6b 100644 |
| --- a/ash/wm/workspace/workspace_window_resizer.h |
| +++ b/ash/wm/workspace/workspace_window_resizer.h |
| @@ -11,6 +11,10 @@ |
| #include "base/compiler_specific.h" |
| #include "base/memory/scoped_ptr.h" |
| +namespace aura { |
| +class RootWindow; |
| +} // namespace aura |
| + |
| namespace ash { |
| namespace internal { |
| @@ -105,12 +109,15 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
| int PrimaryAxisSize(const gfx::Size& size) const; |
| int PrimaryAxisCoordinate(int x, int y) const; |
| - // Updates the bounds of the phantom window. |
| + // Updates the bounds of the phantom window for window snapping. |
| void UpdatePhantomWindow( |
| const gfx::Point& location, |
| const gfx::Rect& bounds, |
| int grid_size); |
| + // Updates the bounds of the phantom window for window dragging. |
| + void UpdateDragPhantomWindow(const gfx::Rect& bounds); |
| + |
| // Restacks the windows z-order position so that one of the windows is at the |
| // top of the z-order, and the rest directly underneath it. |
| void RestackWindows(); |
| @@ -159,6 +166,11 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
| // is a grid and the caption is being dragged. |
| scoped_ptr<PhantomWindowController> phantom_window_controller_; |
|
sky
2012/08/07 03:28:05
Rename this so its clear what its for, maybe snap_
Yusuke Sato
2012/08/07 16:38:30
Done.
|
| + // For now, we show a phantom window on the other root window during dragging. |
| + // TODO(yusukes): Show a semi-transparent image (screen shot) of the window |
| + // instead. |
| + scoped_ptr<PhantomWindowController> drag_phantom_window_controller_; |
| + |
| // Used to determine the target position of a snap. |
| scoped_ptr<SnapSizer> snap_sizer_; |