| Index: ash/wm/workspace/workspace_window_resizer.h
|
| ===================================================================
|
| --- ash/wm/workspace/workspace_window_resizer.h (revision 173169)
|
| +++ ash/wm/workspace/workspace_window_resizer.h (working copy)
|
| @@ -7,12 +7,12 @@
|
|
|
| #include <vector>
|
|
|
| -#include "ash/wm/window_resizer.h"
|
| #include "ash/wm/workspace/magnetism_matcher.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ui/aura/window_tracker.h"
|
| +#include "ui/views/corewm/window_resizer.h"
|
|
|
| namespace ash {
|
| namespace internal {
|
| @@ -21,12 +21,12 @@
|
| class SnapSizer;
|
| class WindowSize;
|
|
|
| -// WindowResizer implementation for workspaces. This enforces that windows are
|
| -// not allowed to vertically move or resize outside of the work area. As windows
|
| -// are moved outside the work area they are shrunk. We remember the height of
|
| -// the window before it was moved so that if the window is again moved up we
|
| -// attempt to restore the old height.
|
| -class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
|
| +// views::corewm::WindowResizer implementation for workspaces. This enforces
|
| +// that windows are not allowed to vertically move or resize outside of the work
|
| +// area. As windows are moved outside the work area they are shrunk. We remember
|
| +// the height of the window before it was moved so that if the window is again
|
| +// moved up we attempt to restore the old height.
|
| +class ASH_EXPORT WorkspaceWindowResizer : public views::corewm::WindowResizer {
|
| public:
|
| // 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
|
| @@ -49,7 +49,7 @@
|
| int window_component,
|
| const std::vector<aura::Window*>& attached_windows);
|
|
|
| - // Overridden from WindowResizer:
|
| + // Overridden from views::corewm::WindowResizer:
|
| virtual void Drag(const gfx::Point& location_in_parent,
|
| int event_flags) OVERRIDE;
|
| virtual void CompleteDrag(int event_flags) OVERRIDE;
|
|
|