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

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

Issue 2897993003: chromeos: converts WindowResizer to aura::Window (Closed)
Patch Set: remove include from exo Created 3 years, 7 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/wm_toplevel_window_event_handler.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 d8cbb763aead467a4384083712b3bff8360c07b2..5817138d360a2778a2a923a70d42f2b44175809c 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/workspace/multi_window_resize_controller.cc
@@ -478,8 +478,7 @@ void MultiWindowResizeController::StartResize(
wm::WindowState* window_state = wm::GetWindowState(windows_.window1);
window_state->CreateDragDetails(location_in_parent, component,
aura::client::WINDOW_MOVE_SOURCE_MOUSE);
- window_resizer_.reset(WorkspaceWindowResizer::Create(
- window_state, WmWindow::FromAuraWindows(windows)));
+ window_resizer_.reset(WorkspaceWindowResizer::Create(window_state, windows));
// Do not hide the resize widget while a drag is active.
mouse_watcher_.reset();
@@ -503,7 +502,7 @@ void MultiWindowResizeController::Resize(const gfx::Point& location_in_screen,
void MultiWindowResizeController::CompleteResize() {
window_resizer_->CompleteDrag();
- window_resizer_->GetTarget()->GetWindowState()->DeleteDragDetails();
+ wm::GetWindowState(window_resizer_->GetTarget())->DeleteDragDetails();
window_resizer_.reset();
// Mouse may still be over resizer, if not hide.
@@ -526,7 +525,7 @@ void MultiWindowResizeController::CancelResize() {
if (!window_resizer_)
return; // Happens if window was destroyed and we nuked the WindowResizer.
window_resizer_->RevertDrag();
- window_resizer_->GetTarget()->GetWindowState()->DeleteDragDetails();
+ wm::GetWindowState(window_resizer_->GetTarget())->DeleteDragDetails();
window_resizer_.reset();
Hide();
}
« no previous file with comments | « ash/wm/wm_toplevel_window_event_handler.cc ('k') | ash/wm/workspace/workspace_window_resizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698