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

Unified Diff: ash/wm/drag_window_resizer.h

Issue 13896026: Stick windows to sides of workspaces (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dock with zero width (comments on unit tests) Created 7 years, 6 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
Index: ash/wm/drag_window_resizer.h
diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h
index 817588274a18fedeb400d9374201cfcb37350359..ee1ccfecabd2f31f5172170f041075908bee1a13 100644
--- a/ash/wm/drag_window_resizer.h
+++ b/ash/wm/drag_window_resizer.h
@@ -29,19 +29,18 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer {
const gfx::Point& location,
int window_component);
- // WindowResizer overides:
+ // WindowResizer:
virtual void Drag(const gfx::Point& location, int event_flags) OVERRIDE;
virtual void CompleteDrag(int event_flags) OVERRIDE;
virtual void RevertDrag() OVERRIDE;
virtual aura::Window* GetTarget() OVERRIDE;
- const gfx::Point& GetInitialLocationInParentForTest() const {
- return details_.initial_location_in_parent;
- }
-
private:
FRIEND_TEST_ALL_PREFIXES(DragWindowResizerTest, DragWindowController);
+ // WindowResizer:
+ virtual const gfx::Point& GetInitialLocationForTest() const OVERRIDE;
+
// Creates DragWindowResizer that adds the ability of dragging windows across
// displays to |next_window_resizer|. This object takes the ownership of
// |next_window_resizer|.
@@ -55,6 +54,9 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer {
// Returns true if we should allow the mouse pointer to warp.
bool ShouldAllowMouseWarp();
+ // return last created instance or NULL.
+ static DragWindowResizer* instance() { return instance_; }
flackr 2013/06/17 18:49:42 nit: I think we should call this last_instance() s
varkha 2013/06/17 19:05:36 Done.
+
scoped_ptr<WindowResizer> next_window_resizer_;
// Shows a semi-transparent image of the window being dragged.
@@ -68,6 +70,9 @@ class ASH_EXPORT DragWindowResizer : public WindowResizer {
// been deleted.
bool* destroyed_;
+ // Last instance created - for use by the DragWindowResizerTest.
+ static DragWindowResizer* instance_;
+
DISALLOW_COPY_AND_ASSIGN(DragWindowResizer);
};

Powered by Google App Engine
This is Rietveld 408576698