| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index 9e9cb21aeb70fa70b82e0387332e1b3305df9802..e45a86f1a8bee46e54f87c20bfd80cb9c0d40e7d 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -452,7 +452,7 @@ bool RootWindowController::CanWindowReceiveEvents(aura::Window* window) {
|
| return true;
|
| }
|
|
|
| -WmWindow* RootWindowController::FindEventTarget(
|
| +aura::Window* RootWindowController::FindEventTarget(
|
| const gfx::Point& location_in_screen) {
|
| gfx::Point location_in_root(location_in_screen);
|
| aura::Window* root_window = GetRootWindow();
|
| @@ -465,7 +465,7 @@ WmWindow* RootWindowController::FindEventTarget(
|
| ->dispatcher()
|
| ->GetDefaultEventTargeter()
|
| ->FindTargetForEvent(root_window, &test_event);
|
| - return WmWindow::Get(static_cast<aura::Window*>(event_handler));
|
| + return static_cast<aura::Window*>(event_handler);
|
| }
|
|
|
| gfx::Point RootWindowController::GetLastMouseLocationInRoot() {
|
|
|