Window ownership -> WindowTreeHost

ui/aura/window_targeter.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/window_targeter.h"
 
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/event_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
@@ skipping 38 matching lines @@
   Window* target = event->IsKeyEvent() ?
       FindTargetForKeyEvent(window, *static_cast<ui::KeyEvent*>(event)) :
       static_cast<Window*>(EventTargeter::FindTargetForEvent(root, event));
   if (target && !window->parent()) {
     // |window| is the root window.
     if (!window->Contains(target)) {
       // |target| is not a descendent of |window|. So do not allow dispatching
       // 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;
     }
   }
   return target;
 }
 
 bool WindowTargeter::SubtreeShouldBeExploredForEvent(
     ui::EventTarget* root,
     const ui::LocatedEvent& event) {
   Window* window = static_cast<Window*>(root);
@@ skipping 36 matching lines @@
   return focused_window ? focused_window : window;
 }
 
 Window* WindowTargeter::FindTargetInRootWindow(Window* root_window,
                                                const ui::LocatedEvent& event) {
   DCHECK_EQ(root_window, root_window->GetRootWindow());
 
   // 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();
   }
 
   // All events should be directed towards the capture window (if any).
   Window* capture_window = client::GetCaptureWindow(root_window);
   if (capture_window)
     return capture_window;
 
   if (event.IsTouchEvent()) {
@@ skipping 11 matching lines @@
 
     // If the initial touch is outside the root window, target the root.
     if (!root_window->bounds().Contains(event.location()))
       return root_window;
   }
 
   return NULL;
 }
 
 }  // namespace aura