| Index: ash/wm/toplevel_window_event_handler.cc
|
| diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
|
| index f6d5902d2cc37e1527e8873eceb3f9ec09cf4641..ef8051d1eb1c83c1d0170eda29f744d5a5ba0dfe 100644
|
| --- a/ash/wm/toplevel_window_event_handler.cc
|
| +++ b/ash/wm/toplevel_window_event_handler.cc
|
| @@ -335,7 +335,7 @@ aura::client::WindowMoveResult ToplevelWindowEventHandler::RunMoveLoop(
|
| DCHECK(!in_move_loop_); // Can only handle one nested loop at a time.
|
| in_move_loop_ = true;
|
| move_cancelled_ = false;
|
| - aura::RootWindow* root_window = source->GetRootWindow();
|
| + aura::Window* root_window = source->GetRootWindow();
|
| DCHECK(root_window);
|
| gfx::Point drag_location;
|
| if (move_source == aura::client::WINDOW_MOVE_SOURCE_TOUCH &&
|
| @@ -345,7 +345,7 @@ aura::client::WindowMoveResult ToplevelWindowEventHandler::RunMoveLoop(
|
| GetLastTouchPointForTarget(source, &drag_location);
|
| DCHECK(has_point);
|
| } else {
|
| - drag_location = root_window->GetLastMouseLocationInRoot();
|
| + drag_location = root_window->GetDispatcher()->GetLastMouseLocationInRoot();
|
| aura::Window::ConvertPointToTarget(
|
| root_window, source->parent(), &drag_location);
|
| }
|
|
|