Extract the code for supporing extended desktop from WorkspaceWindowResizer into DragWindowResizer.

ash/wm/window_resizer.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_WM_WINDOW_RESIZER_H_
 #define ASH_WM_WINDOW_RESIZER_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
 class Window;
 }
 
 namespace ash {
 
 // WindowResizer is used by ToplevelWindowEventFilter to handle dragging, moving
 // or resizing a window. All coordinates passed to this are in the parent
 // windows coordinates.
 class ASH_EXPORT WindowResizer {
  public:
-  // Constants to identify the type of resize.
-  static const int kBoundsChange_None;
-  static const int kBoundsChange_Repositions;
-  static const int kBoundsChange_Resizes;
-
-  // Used to indicate which direction the resize occurs in.
-  static const int kBoundsChangeDirection_None;
-  static const int kBoundsChangeDirection_Horizontal;
-  static const int kBoundsChangeDirection_Vertical;
-
-  WindowResizer();
-  virtual ~WindowResizer();
-
-  // Returns a bitmask of the kBoundsChange_ values.
-  static int GetBoundsChangeForWindowComponent(int component);
-
-  // Invoked to drag/move/resize the window. |location| is in the coordinates
-  // of the window supplied to the constructor. |event_flags| is the event
-  // flags from the event.
-  virtual void Drag(const gfx::Point& location, int event_flags) = 0;
-
-  // Invoked to complete the drag.
-  virtual void CompleteDrag(int event_flags) = 0;
-
-  // Reverts the drag.
-  virtual void RevertDrag() = 0;
-
-  // Returns the target window the resizer was created for.
-  virtual aura::Window* GetTarget() = 0;
-
- protected:
   struct Details {

[sky, 2012/12/04 15:58:53]

Why do you need to expose all this?

[mazda, 2012/12/04 18:44:41]

I needed to create Details in CreateWindowResizer (declared at the end of this
file) to pass it to DragWindowResizer's constructor.
Is it better to add DragWindowResizer::Create and create Details in it to keep
Details protected?

[sky, 2012/12/04 22:39:43]

Yes please.

     Details();
     Details(aura::Window* window,
             const gfx::Point& location,
             int window_component);
     ~Details();
 
     // The window we're resizing.
     aura::Window* window;
 
     // Initial bounds of the window in parent coordinates.
@@ skipping 18 matching lines @@
     // Bitmask of the |kBoundsChangeDirection_| constants.
     int position_change_direction;
 
     // Bitmask of the |kBoundsChangeDirection_| constants.
     int size_change_direction;
 
     // Will the drag actually modify the window?
     bool is_resizable;
   };
 
+  // Constants to identify the type of resize.
+  static const int kBoundsChange_None;
+  static const int kBoundsChange_Repositions;
+  static const int kBoundsChange_Resizes;
+
+  // Used to indicate which direction the resize occurs in.
+  static const int kBoundsChangeDirection_None;
+  static const int kBoundsChangeDirection_Horizontal;
+  static const int kBoundsChangeDirection_Vertical;
+
+  WindowResizer();
+  virtual ~WindowResizer();
+
+  // Returns a bitmask of the kBoundsChange_ values.
+  static int GetBoundsChangeForWindowComponent(int component);
+
+  // Invoked to drag/move/resize the window. |location| is in the coordinates
+  // of the window supplied to the constructor. |event_flags| is the event
+  // flags from the event.
+  virtual void Drag(const gfx::Point& location, int event_flags) = 0;
+
+  // Invoked to complete the drag.
+  virtual void CompleteDrag(int event_flags) = 0;
+
+  // Reverts the drag.
+  virtual void RevertDrag() = 0;
+
+  // Returns the target window the resizer was created for.
+  virtual aura::Window* GetTarget() = 0;
+
+ protected:
   static gfx::Rect CalculateBoundsForDrag(const Details& details,
                                           const gfx::Point& location);
 
   static gfx::Rect AdjustBoundsToGrid(const gfx::Rect& bounds,
                                       int grid_size);
 
   static bool IsBottomEdge(int component);
 
  private:
   // Returns the new origin of the window. The arguments are the difference
@@ skipping 13 matching lines @@
                              int* delta_x);
 
   // Returns the height of the drag.
   static int GetHeightForDrag(const Details& details,
                               int min_height,
                               int* delta_y);
 };
 
 // Creates a WindowResizer for |window|. This can return a scoped_ptr
 // initialized with NULL if |window| should not be resized nor dragged.
-scoped_ptr<WindowResizer> CreateWindowResizer(
+ASH_EXPORT scoped_ptr<WindowResizer> CreateWindowResizer(
     aura::Window* window,
     const gfx::Point& point_in_parent,
     int window_component);
 
 }  // namespace aura
 
 #endif  // ASH_WM_WINDOW_RESIZER_H_