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

Unified Diff: ash/wm/workspace/multi_window_resize_controller.cc

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/window_state.cc ('k') | ash/wm/workspace/workspace_window_resizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/multi_window_resize_controller.cc
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/wm/workspace/multi_window_resize_controller.cc
index 573824e6bc332f7e72b43d6e9519ccdc42ba0faa..6b5a0069a01ccbbe6ad3788bc8912e9764ce0a61 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -433,12 +433,12 @@ void MultiWindowResizeController::StartResize(
windows.push_back(windows_.other_windows[i]);
}
int component = windows_.direction == LEFT_RIGHT ? HTRIGHT : HTBOTTOM;
- window_resizer_.reset(WorkspaceWindowResizer::Create(
- windows_.window1,
- location_in_parent,
- component,
- aura::client::WINDOW_MOVE_SOURCE_MOUSE,
- windows));
+ wm::WindowState* window_state = wm::GetWindowState(windows_.window1);
+ window_state->CreateDragDetails(windows_.window1,
+ location_in_parent,
+ component,
+ aura::client::WINDOW_MOVE_SOURCE_MOUSE);
+ window_resizer_.reset(WorkspaceWindowResizer::Create(window_state, windows));
}
void MultiWindowResizeController::Resize(const gfx::Point& location_in_screen,
@@ -460,6 +460,7 @@ void MultiWindowResizeController::Resize(const gfx::Point& location_in_screen,
void MultiWindowResizeController::CompleteResize() {
window_resizer_->CompleteDrag();
+ wm::GetWindowState(window_resizer_->GetTarget())->DeleteDragDetails();
window_resizer_.reset();
// Mouse may still be over resizer, if not hide.
@@ -480,6 +481,7 @@ void MultiWindowResizeController::CancelResize() {
if (!window_resizer_)
return; // Happens if window was destroyed and we nuked the WindowResizer.
window_resizer_->RevertDrag();
+ wm::GetWindowState(window_resizer_->GetTarget())->DeleteDragDetails();
window_resizer_.reset();
Hide();
}
« no previous file with comments | « ash/wm/window_state.cc ('k') | ash/wm/workspace/workspace_window_resizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698