Window ownership -> WindowTreeHost

chrome/browser/ui/views/tabs/window_finder_x11.cc

 // Copyright 2014 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 "chrome/browser/ui/views/tabs/window_finder.h"
 
 #include "base/debug/trace_event.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 #if defined(USE_ASH)
 aura::Window* GetLocalProcessWindowAtPointAsh(
     const gfx::Point& screen_point,
     const std::set<aura::Window*>& ignore);
 #endif
 
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 // BaseWindowFinder
 //
 // Base class used to locate a window. A subclass need only override
 // ShouldStopIterating to determine when iteration should stop.
 class BaseWindowFinder : public ui::EnumerateWindowsDelegate {
  public:
   explicit BaseWindowFinder(const std::set<aura::Window*>& ignore) {
     std::set<aura::Window*>::iterator iter;
     for (iter = ignore.begin(); iter != ignore.end(); iter++) {
-      XID xid = (*iter)->GetDispatcher()->host()->GetAcceleratedWidget();
+      XID xid = (*iter)->GetHost()->GetAcceleratedWidget();
       ignore_.insert(xid);
     }
   }
 
   virtual ~BaseWindowFinder() {}
 
  protected:
   // Returns true if |window| is in the ignore list.
   bool ShouldIgnoreWindow(XID window) {
     return (ignore_.find(window) != ignore_.end());
@@ skipping 92 matching lines @@
     }
     return 0;
   }
 
  protected:
   virtual bool ShouldStopIterating(XID window) OVERRIDE {
     if (BaseWindowFinder::ShouldIgnoreWindow(window))
       return false;
 
     // Check if this window is in our process.
-    if (!aura::WindowEventDispatcher::GetForAcceleratedWidget(window))
+    if (!aura::WindowTreeHost::GetForAcceleratedWidget(window))
       return false;
 
     if (!ui::IsWindowVisible(window))
       return false;
 
     if (ui::WindowContainsPoint(window, screen_loc_)) {
       result_ = window;
       return true;
     }
 
@@ skipping 28 matching lines @@
 #if defined(USE_ASH)
   if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
     return GetLocalProcessWindowAtPointAsh(screen_point, ignore);
 #endif
   // The X11 server is the canonical state of what the window stacking order
   // is.
   XID xid =
       LocalProcessWindowFinder::GetProcessWindowAtPoint(screen_point, ignore);
   return views::DesktopWindowTreeHostX11::GetContentWindowForXID(xid);
 }