Move root_window_host* in aura to window_tree_host*.

ui/views/widget/desktop_aura/x11_window_event_filter.cc

Index: ui/views/widget/desktop_aura/x11_window_event_filter.cc
diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
index f9febf962bc85b47ea83908cc0475c5013e270bd..1336c4653acb743de2d63bf8970b0f4063f0494c 100644
--- a/ui/views/widget/desktop_aura/x11_window_event_filter.cc
+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
@@ -17,7 +17,7 @@
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/x/x11_types.h"
-#include "ui/views/widget/desktop_aura/desktop_root_window_host.h"
+#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace {
@@ -62,12 +62,12 @@ namespace views {
 
 X11WindowEventFilter::X11WindowEventFilter(
     aura::RootWindow* root_window,
-    DesktopWindowTreeHost* root_window_host)
+    DesktopWindowTreeHost* window_tree_host)
     : xdisplay_(gfx::GetXDisplay()),
       xwindow_(root_window->host()->GetAcceleratedWidget()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       atom_cache_(xdisplay_, kAtomsToCache),
-      root_window_host_(root_window_host),
+      window_tree_host_(window_tree_host),
       is_active_(false) {
 }
 
@@ -113,10 +113,10 @@ void X11WindowEventFilter::OnMouseEvent(ui::MouseEvent* event) {
     // Our event is a double click in the caption area in a window that can be
     // maximized. We are responsible for dispatching this as a minimize/
     // maximize on X11 (Windows converts this to min/max events for us).
-    if (root_window_host_->IsMaximized())
-      root_window_host_->Restore();
+    if (window_tree_host_->IsMaximized())
+      window_tree_host_->Restore();
     else
-      root_window_host_->Maximize();
+      window_tree_host_->Maximize();
     event->SetHandled();
     return;
   }