Move root_window_host* in aura to window_tree_host*.

chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc

Index: chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc
diff --git a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc b/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc
deleted file mode 100644
index 2ff9be141e5504d8b9d3377c9b93f7f391d3d21f..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// 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 "chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h"
-
-////////////////////////////////////////////////////////////////////////////////
-// BrowserDesktopWindowTreeHostX11, public:
-
-BrowserDesktopWindowTreeHostX11::BrowserDesktopWindowTreeHostX11(
-    views::internal::NativeWidgetDelegate* native_widget_delegate,
-    views::DesktopNativeWidgetAura* desktop_native_widget_aura,
-    BrowserView* browser_view)
-    : DesktopWindowTreeHostX11(native_widget_delegate,
-                               desktop_native_widget_aura),
-      browser_view_(browser_view) {
-}
-
-BrowserDesktopWindowTreeHostX11::~BrowserDesktopWindowTreeHostX11() {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// BrowserDesktopWindowTreeHostX11,
-//     BrowserDesktopWindowTreeHost implementation:
-
-views::DesktopWindowTreeHost*
-    BrowserDesktopWindowTreeHostX11::AsDesktopWindowTreeHost() {
-  return this;
-}
-
-int BrowserDesktopWindowTreeHostX11::GetMinimizeButtonOffset() const {
-  return 0;
-}
-
-bool BrowserDesktopWindowTreeHostX11::UsesNativeSystemMenu() const {
-  return false;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// BrowserDesktopWindowTreeHostX11,
-//     views::DesktopWindowTreeHostX11 implementation:
-
-void BrowserDesktopWindowTreeHostX11::Init(
-    aura::Window* content_window,
-    const views::Widget::InitParams& params,
-    aura::RootWindow::CreateParams* rw_create_params) {
-  views::DesktopWindowTreeHostX11::Init(content_window, params,
-                                        rw_create_params);
-
-  // We have now created our backing X11 window. We now need to (possibly)
-  // alert Unity that there's a menu bar attached to it.
-  global_menu_bar_x11_.reset(new GlobalMenuBarX11(browser_view_, this));
-}
-
-void BrowserDesktopWindowTreeHostX11::CloseNow() {
-  global_menu_bar_x11_.reset();
-  DesktopWindowTreeHostX11::CloseNow();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// BrowserDesktopWindowTreeHost, public:
-
-// static
-BrowserDesktopWindowTreeHost*
-    BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
-        views::internal::NativeWidgetDelegate* native_widget_delegate,
-        views::DesktopNativeWidgetAura* desktop_native_widget_aura,
-        BrowserView* browser_view,
-        BrowserFrame* browser_frame) {
-  return new BrowserDesktopWindowTreeHostX11(native_widget_delegate,
-                                             desktop_native_widget_aura,
-                                             browser_view);
-}