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 a948cc8311e15cdb2d8f88a3393a29dd6b1ef1e0..f234a9eece5078e7327556c2493c3b50402a0b52 100644 |
--- a/ash/wm/workspace/workspace_window_resizer.h |
+++ b/ash/wm/workspace/workspace_window_resizer.h |
@@ -25,6 +25,7 @@ class Layer; |
namespace ash { |
namespace internal { |
+class DragWindowController; |
class PhantomWindowController; |
class SnapSizer; |
class WindowSize; |
@@ -76,7 +77,7 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
const std::vector<aura::Window*>& attached_windows); |
private: |
- FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomStyle); |
+ FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, DragWindowController); |
FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, CancelSnapPhantom); |
FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomSnapMaxSize); |
@@ -168,7 +169,7 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
// Updates the bounds of the phantom window for window dragging. Set true on |
// |in_original_root| if the pointer is still in |window()->GetRootWindow()|. |
- void UpdateDragPhantomWindow(const gfx::Rect& bounds, bool in_original_root); |
+ void UpdateDragWindow(const gfx::Rect& bounds, bool in_original_root); |
// 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. |
@@ -181,9 +182,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
// Returns true if we should allow the mouse pointer to warp. |
bool ShouldAllowMouseWarp() const; |
- // Recreates a fresh layer for window() and all its child windows. |
- void RecreateWindowLayers(); |
- |
aura::Window* window() const { return details_.window; } |
const Details details_; |
@@ -208,7 +206,7 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
scoped_ptr<PhantomWindowController> snap_phantom_window_controller_; |
// Shows a semi-transparent image of the window being dragged. |
- scoped_ptr<PhantomWindowController> drag_phantom_window_controller_; |
+ scoped_ptr<DragWindowController> drag_window_controller_; |
// Used to determine the target position of a snap. |
scoped_ptr<SnapSizer> snap_sizer_; |
@@ -224,10 +222,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { |
// The mouse location passed to Drag(). |
gfx::Point last_mouse_location_; |
- // The copy of window()->layer() and its children. This object is the owner of |
- // the layer. |
- ui::Layer* layer_; |
- |
// If non-NULL the destructor sets this to true. Used to determine if this has |
// been deleted. |
bool* destroyed_; |