| 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 f234a9eece5078e7327556c2493c3b50402a0b52..a4bc97130c7daf075d08b250efc7b5057478f080 100644
|
| --- a/ash/wm/workspace/workspace_window_resizer.h
|
| +++ b/ash/wm/workspace/workspace_window_resizer.h
|
| @@ -14,18 +14,9 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ui/aura/window_tracker.h"
|
|
|
| -namespace aura {
|
| -class RootWindow;
|
| -} // namespace aura
|
| -
|
| -namespace ui {
|
| -class Layer;
|
| -} // namespace ui
|
| -
|
| namespace ash {
|
| namespace internal {
|
|
|
| -class DragWindowController;
|
| class PhantomWindowController;
|
| class SnapSizer;
|
| class WindowSize;
|
| @@ -37,6 +28,9 @@ class WindowSize;
|
| // attempt to restore the old height.
|
| class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| public:
|
| + WorkspaceWindowResizer(const Details& details,
|
| + const std::vector<aura::Window*>& attached_windows);
|
| +
|
| // When dragging an attached window this is the min size we'll make sure is
|
| // visible. In the vertical direction we take the max of this and that from
|
| // the delegate.
|
| @@ -58,13 +52,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| int window_component,
|
| const std::vector<aura::Window*>& attached_windows);
|
|
|
| - // Returns true if the drag will result in changing the window in anyway.
|
| - bool is_resizable() const { return details_.is_resizable; }
|
| -
|
| - const gfx::Point& initial_location_in_parent() const {
|
| - return details_.initial_location_in_parent;
|
| - }
|
| -
|
| // Overridden from WindowResizer:
|
| virtual void Drag(const gfx::Point& location_in_parent,
|
| int event_flags) OVERRIDE;
|
| @@ -72,12 +59,11 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| virtual void RevertDrag() OVERRIDE;
|
| virtual aura::Window* GetTarget() OVERRIDE;
|
|
|
| - private:
|
| - WorkspaceWindowResizer(const Details& details,
|
| - const std::vector<aura::Window*>& attached_windows);
|
| + const gfx::Point& GetInitialLocationInParentForTest() const {
|
| + return details_.initial_location_in_parent;
|
| + }
|
|
|
| private:
|
| - FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, DragWindowController);
|
| FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, CancelSnapPhantom);
|
| FRIEND_TEST_ALL_PREFIXES(WorkspaceWindowResizerTest, PhantomSnapMaxSize);
|
|
|
| @@ -167,10 +153,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| void UpdateSnapPhantomWindow(const gfx::Point& location,
|
| const gfx::Rect& bounds);
|
|
|
| - // 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 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.
|
| void RestackWindows();
|
| @@ -179,9 +161,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| // snapping should be used.
|
| SnapType GetSnapType(const gfx::Point& location) const;
|
|
|
| - // Returns true if we should allow the mouse pointer to warp.
|
| - bool ShouldAllowMouseWarp() const;
|
| -
|
| aura::Window* window() const { return details_.window; }
|
|
|
| const Details details_;
|
| @@ -205,9 +184,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| // is a grid and the caption is being dragged.
|
| scoped_ptr<PhantomWindowController> snap_phantom_window_controller_;
|
|
|
| - // Shows a semi-transparent image of the window being dragged.
|
| - scoped_ptr<DragWindowController> drag_window_controller_;
|
| -
|
| // Used to determine the target position of a snap.
|
| scoped_ptr<SnapSizer> snap_sizer_;
|
|
|
| @@ -222,10 +198,6 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| // The mouse location passed to Drag().
|
| gfx::Point last_mouse_location_;
|
|
|
| - // If non-NULL the destructor sets this to true. Used to determine if this has
|
| - // been deleted.
|
| - bool* destroyed_;
|
| -
|
| // Window the drag has magnetically attached to.
|
| aura::Window* magnetism_window_;
|
|
|
|
|