ash/wm/window_resizer.cc - Issue 425363002: Moving coordinate conversion methods from ash/wm to ui/wm.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/window_resizer.cc

Issue 425363002: Moving coordinate conversion methods from ash/wm to ui/wm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: git cl format Created 6 years, 5 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

« ash/autoclick/autoclick_controller.cc ('K') | « ash/wm/panels/panel_window_resizer.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | ui/wm/core/coordinate_conversion.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/wm/window_resizer.cc

diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc

index 08ff0c42fec07d859f6c2229c055d7ec262ae785..fbdc29c7e69d46e7e87cb81e40c4c9fe4979280d 100644

--- a/ash/wm/window_resizer.cc

+++ b/ash/wm/window_resizer.cc

@@ -20,6 +20,7 @@

#include "ui/compositor/scoped_layer_animation_settings.h"

#include "ui/gfx/display.h"

#include "ui/gfx/screen.h"

+#include "ui/wm/core/coordinate_conversion.h"

namespace ash {

@@ -204,7 +205,7 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag(

// for the current display but the window can move to a different one.

aura::Window* parent = GetTarget()->parent();

gfx::Point passed_location_in_screen(passed_location);

- wm::ConvertPointToScreen(parent, &passed_location_in_screen);

+ ::wm::ConvertPointToScreen(parent, &passed_location_in_screen);

gfx::Rect near_passed_location(passed_location_in_screen, gfx::Size());

// Use a pointer location (matching the logic in DragWindowResizer) to

// calculate the target display after the drag.