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

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

Issue 1901773002: Removes most of aura dependencies from DefaultState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wm_window_positioner
Patch Set: nit and merge Created 4 years, 8 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/workspace/workspace_types.h ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_window_resizer.cc
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
index ed20fb5583eee937d5eb2791c48b3ddf4753f7b0..16151b8ffc740d990894482949294eb44d574c6a 100644
--- a/ash/wm/workspace/workspace_window_resizer.cc
+++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -15,6 +15,7 @@
#include "ash/screen_util.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
+#include "ash/wm/common/window_positioning_utils.h"
#include "ash/wm/common/wm_event.h"
#include "ash/wm/default_window_resizer.h"
#include "ash/wm/dock/docked_window_layout_manager.h"
@@ -966,9 +967,11 @@ void WorkspaceWindowResizer::UpdateSnapPhantomWindow(const gfx::Point& location,
phantom_bounds = ScreenUtil::ConvertRectFromScreen(
GetTarget()->parent(), dock_layout_->dragged_bounds());
} else {
- phantom_bounds = (snap_type_ == SNAP_LEFT) ?
- wm::GetDefaultLeftSnappedWindowBoundsInParent(GetTarget()) :
- wm::GetDefaultRightSnappedWindowBoundsInParent(GetTarget());
+ phantom_bounds = (snap_type_ == SNAP_LEFT)
+ ? wm::GetDefaultLeftSnappedWindowBoundsInParent(
+ wm::WmWindowAura::Get(GetTarget()))
+ : wm::GetDefaultRightSnappedWindowBoundsInParent(
+ wm::WmWindowAura::Get(GetTarget()));
}
if (!snap_phantom_window_controller_) {
« no previous file with comments | « ash/wm/workspace/workspace_types.h ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698