Revert 236048 "Rename RootWindowHost* to WindowTreeHost*"

trunk/src/ui/views/widget/desktop_aura/desktop_screen_x11.cc

 // Copyright (c) 2012 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/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
 
 // It clashes with out RootWindow.
@@ skipping 165 matching lines @@
   return gfx::Point(root_x, root_y);
 }
 
 gfx::NativeWindow DesktopScreenX11::GetWindowUnderCursor() {
   return GetWindowAtScreenPoint(GetCursorScreenPoint());
 }
 
 gfx::NativeWindow DesktopScreenX11::GetWindowAtScreenPoint(
     const gfx::Point& point) {
   std::vector<aura::Window*> windows =
-      DesktopWindowTreeHostX11::GetAllOpenWindows();
+      DesktopRootWindowHostX11::GetAllOpenWindows();
 
   for (std::vector<aura::Window*>::const_iterator it = windows.begin();
        it != windows.end(); ++it) {
     if ((*it)->GetBoundsInScreen().Contains(point))
       return *it;
   }
 
   return NULL;
 }
 
@@ skipping 11 matching lines @@
   //
   // You'd think we'd be able to just call window->GetBoundsInScreen(), but we
   // can't because |window| (and the associated RootWindow*) can be partially
   // initialized at this point; RootWindow initializations call through into
   // GetDisplayNearestWindow(). But the X11 resources are created before we
   // create the aura::RootWindow. So we ask what the DRWHX11 believes the
   // window bounds are instead of going through the aura::Window's screen
   // bounds.
   aura::WindowEventDispatcher* dispatcher = window->GetDispatcher();
   if (dispatcher) {
-    DesktopWindowTreeHostX11* rwh = DesktopWindowTreeHostX11::GetHostForXID(
+    DesktopRootWindowHostX11* rwh = DesktopRootWindowHostX11::GetHostForXID(
         dispatcher->host()->GetAcceleratedWidget());
     if (rwh)
       return GetDisplayMatching(rwh->GetX11RootWindowBounds());
   }
 
   return GetPrimaryDisplay();
 }
 
 gfx::Display DesktopScreenX11::GetDisplayNearestPoint(
     const gfx::Point& point) const {
@@ skipping 155 matching lines @@
   ProcessDisplayChange(new_displays);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views