| Index: ash/drag_drop/drag_drop_tracker.cc
|
| diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc
|
| index e0f81362ba1f226c3be0491d03c47db4e294e694..9a19070e991835822884368ea33c7de5bf63d775 100644
|
| --- a/ash/drag_drop/drag_drop_tracker.cc
|
| +++ b/ash/drag_drop/drag_drop_tracker.cc
|
| @@ -6,7 +6,8 @@
|
|
|
| #include "ash/shell.h"
|
| #include "ash/shell_window_ids.h"
|
| -#include "ash/wm/coordinate_conversion.h"
|
| +#include "ash/wm/aura/wm_window_aura.h"
|
| +#include "ash/wm/common/root_window_finder.h"
|
| #include "ui/aura/client/window_tree_client.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_event_dispatcher.h"
|
| @@ -72,7 +73,7 @@ aura::Window* DragDropTracker::GetTarget(const ui::LocatedEvent& event) {
|
| gfx::Point location_in_screen = event.location();
|
| ::wm::ConvertPointToScreen(capture_window_.get(), &location_in_screen);
|
| aura::Window* root_window_at_point =
|
| - wm::GetRootWindowAt(location_in_screen);
|
| + wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(location_in_screen));
|
| gfx::Point location_in_root = location_in_screen;
|
| ::wm::ConvertPointFromScreen(root_window_at_point, &location_in_root);
|
| return root_window_at_point->GetEventHandlerForPoint(location_in_root);
|
| @@ -90,7 +91,7 @@ ui::LocatedEvent* DragDropTracker::ConvertEvent(
|
| gfx::Point target_root_location = event.root_location();
|
| aura::Window::ConvertPointToTarget(
|
| capture_window_->GetRootWindow(),
|
| - ash::wm::GetRootWindowAt(location_in_screen),
|
| + wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(location_in_screen)),
|
| &target_root_location);
|
| return new ui::MouseEvent(
|
| event.type(), target_location, target_root_location,
|
|
|