Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(708)

Unified Diff: ash/wm/drag_window_resizer.h

Issue 121153003: Prevents panels attached to shelf from docking (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevents panels attached to shelf from docking (nits) Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/drag_details.cc ('k') | ash/wm/drag_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/drag_window_resizer.h
diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h
index 108bfedc6372e6d6551ec2f104776ee0957435a3..2cb6ecca63c8e9ba1537519856793579c3544152 100644
--- a/ash/wm/drag_window_resizer.h
+++ b/ash/wm/drag_window_resizer.h
@@ -27,17 +27,12 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer {
// returned object. The ownership of |next_window_resizer| is taken by the
// returned object. Returns NULL if not resizable.
static DragWindowResizer* Create(WindowResizer* next_window_resizer,
- aura::Window* window,
- const gfx::Point& location,
- int window_component,
- aura::client::WindowMoveSource source);
+ wm::WindowState* window_state);
// WindowResizer:
virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE;
virtual void CompleteDrag() OVERRIDE;
virtual void RevertDrag() OVERRIDE;
- virtual aura::Window* GetTarget() OVERRIDE;
- virtual const gfx::Point& GetInitialLocation() const OVERRIDE;
private:
FRIEND_TEST_ALL_PREFIXES(DragWindowResizerTest, DragWindowController);
@@ -46,7 +41,7 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer {
// displays to |next_window_resizer|. This object takes the ownership of
// |next_window_resizer|.
explicit DragWindowResizer(WindowResizer* next_window_resizer,
- const Details& details);
+ wm::WindowState* window_state);
// Updates the bounds of the phantom window for window dragging. Set true on
// |in_original_root| if the pointer is still in |window()->GetRootWindow()|.
@@ -68,8 +63,6 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer {
// Shows a semi-transparent image of the window being dragged.
scoped_ptr<DragWindowController> drag_window_controller_;
- const Details details_;
-
gfx::Point last_mouse_location_;
// Current instance for use by the DragWindowResizerTest.
« no previous file with comments | « ash/wm/drag_details.cc ('k') | ash/wm/drag_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698