Window ownership -> WindowTreeHost

ui/aura/window_targeter.cc

Index: ui/aura/window_targeter.cc
diff --git a/ui/aura/window_targeter.cc b/ui/aura/window_targeter.cc
index a50f9812ea15d7c30e804160d058fe61c2fb63aa..c0c194ecf8a256b1385fb5de93e48ab1147ec2b5 100644
--- a/ui/aura/window_targeter.cc
+++ b/ui/aura/window_targeter.cc
@@ -56,7 +56,7 @@ ui::EventTarget* WindowTargeter::FindTargetForEvent(ui::EventTarget* root,
       // from here. Instead, dispatch the event through the
       // WindowEventDispatcher that owns |target|.
       ui::EventDispatchDetails details ALLOW_UNUSED =
-          target->GetDispatcher()->OnEventFromSource(event);
+          target->GetHost()->dispatcher()->OnEventFromSource(event);
       target = NULL;
     }
   }
@@ -113,7 +113,7 @@ Window* WindowTargeter::FindTargetInRootWindow(Window* root_window,
   // Mouse events should be dispatched to the window that processed the
   // mouse-press events (if any).
   if (event.IsScrollEvent() || event.IsMouseEvent()) {
-    WindowEventDispatcher* dispatcher = root_window->GetDispatcher();
+    WindowEventDispatcher* dispatcher = root_window->GetHost()->dispatcher();
     if (dispatcher->mouse_pressed_handler())
       return dispatcher->mouse_pressed_handler();
   }