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

Unified Diff: ash/wm/drag_window_resizer.cc

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 (drag resizer instance) 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.cc
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc
index d0f977551f78c0d7c99e0247683d36bb54067c6e..479d0242757cfb025c66cf01237f5968b7d375ee 100644
--- a/ash/wm/drag_window_resizer.cc
+++ b/ash/wm/drag_window_resizer.cc
@@ -44,13 +44,18 @@ aura::RootWindow* GetAnotherRootWindow(aura::RootWindow* root_window) {
return root_windows[0];
}
-}
+} // namespace
+
+// static
+DragWindowResizer* DragWindowResizer::instance_ = NULL;
DragWindowResizer::~DragWindowResizer() {
Shell* shell = Shell::GetInstance();
shell->mouse_cursor_filter()->set_mouse_warp_mode(
MouseCursorEventFilter::WARP_ALWAYS);
shell->mouse_cursor_filter()->HideSharedEdgeIndicator();
+ if (instance_ == this)
+ instance_ = NULL;
if (destroyed_)
*destroyed_ = true;
@@ -125,6 +130,10 @@ aura::Window* DragWindowResizer::GetTarget() {
return next_window_resizer_->GetTarget();
}
+const gfx::Point& DragWindowResizer::GetInitialLocation() const {
+ return details_.initial_location_in_parent;
+}
+
DragWindowResizer::DragWindowResizer(WindowResizer* next_window_resizer,
const Details& details)
: next_window_resizer_(next_window_resizer),
@@ -144,6 +153,7 @@ DragWindowResizer::DragWindowResizer(WindowResizer* next_window_resizer,
mouse_cursor_filter->ShowSharedEdgeIndicator(
details.window->GetRootWindow());
}
+ instance_ = this;
}
void DragWindowResizer::UpdateDragWindow(const gfx::Rect& bounds,

Powered by Google App Engine
This is Rietveld 408576698