Index: ash/wm/workspace/multi_window_resize_controller.cc |
=================================================================== |
--- ash/wm/workspace/multi_window_resize_controller.cc (revision 150582) |
+++ ash/wm/workspace/multi_window_resize_controller.cc (working copy) |
@@ -180,7 +180,7 @@ |
windows_.window1->AddObserver(this); |
windows_.window2->AddObserver(this); |
show_location_in_parent_ = point_in_window; |
- Window::ConvertPointToWindow( |
+ Window::ConvertPointToTarget( |
window, window->parent(), &show_location_in_parent_); |
if (show_timer_.IsRunning()) |
return; |
@@ -225,7 +225,7 @@ |
const gfx::Point& point) const { |
ResizeWindows result; |
gfx::Point point_in_parent(point); |
- Window::ConvertPointToWindow(window, window->parent(), &point_in_parent); |
+ Window::ConvertPointToTarget(window, window->parent(), &point_in_parent); |
switch (window_component) { |
case HTRIGHT: |
result.direction = LEFT_RIGHT; |
@@ -505,7 +505,7 @@ |
return false; |
gfx::Point window_loc(location_in_screen); |
- aura::Window::ConvertPointToWindow( |
+ aura::Window::ConvertPointToTarget( |
window->GetRootWindow(), window, &window_loc); |
return window->HitTest(window_loc) && |
window->delegate()->GetNonClientComponent(window_loc) == component; |