| Index: components/exo/shell_surface.cc
|
| diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
|
| index 476a475ec8a2d8bdecf76e0e6f20c8c94333fafa..786dee710c554d4a32692f50afa46b06386ef213 100644
|
| --- a/components/exo/shell_surface.cc
|
| +++ b/components/exo/shell_surface.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "ash/shell.h"
|
| #include "ash/shell_window_ids.h"
|
| +#include "ash/wm/aura/wm_window_aura.h"
|
| #include "ash/wm/window_resizer.h"
|
| #include "ash/wm/window_state.h"
|
| #include "ash/wm/window_state_aura.h"
|
| @@ -762,8 +763,9 @@ void ShellSurface::AttemptToStartDrag(int component) {
|
| aura::Window* root_window = widget_->GetNativeWindow()->GetRootWindow();
|
| gfx::Point drag_location =
|
| root_window->GetHost()->dispatcher()->GetLastMouseLocationInRoot();
|
| - aura::Window::ConvertPointToTarget(
|
| - root_window, widget_->GetNativeWindow()->parent(), &drag_location);
|
| + aura::Window::ConvertPointToTarget(ash::wm::WmWindowAura::Get(root_window),
|
| + widget_->GetNativeWindow()->parent(),
|
| + &drag_location);
|
|
|
| // Set the cursor before calling CreateWindowResizer(), as that will
|
| // eventually call LockCursor() and prevent the cursor from changing.
|
| @@ -804,9 +806,9 @@ void ShellSurface::AttemptToStartDrag(int component) {
|
| break;
|
| }
|
|
|
| - resizer_ = ash::CreateWindowResizer(widget_->GetNativeWindow(), drag_location,
|
| - component,
|
| - aura::client::WINDOW_MOVE_SOURCE_MOUSE);
|
| + resizer_ = ash::CreateWindowResizer(
|
| + ash::wm::WmWindowAura::Get(widget_->GetNativeWindow()), drag_location,
|
| + component, aura::client::WINDOW_MOVE_SOURCE_MOUSE);
|
| if (!resizer_)
|
| return;
|
|
|
|
|