Revert 215769 "linux_aura: Implement the static part of the dbus..."

trunk/src/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h

Index: trunk/src/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h
===================================================================
--- trunk/src/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h	(revision 215779)
+++ trunk/src/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h	(working copy)
@@ -7,7 +7,6 @@
 
 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
 #include "chrome/browser/ui/views/frame/browser_desktop_root_window_host.h"
-#include "chrome/browser/ui/views/frame/global_menu_bar_x11.h"
 
 class BrowserFrame;
 class BrowserView;
@@ -23,8 +22,7 @@
   BrowserDesktopRootWindowHostX11(
       views::internal::NativeWidgetDelegate* native_widget_delegate,
       views::DesktopNativeWidgetAura* desktop_native_widget_aura,
-      const gfx::Rect& initial_bounds,
-      BrowserView* browser_view);
+      const gfx::Rect& initial_bounds);
   virtual ~BrowserDesktopRootWindowHostX11();
 
  private:
@@ -33,20 +31,8 @@
   virtual int GetMinimizeButtonOffset() const OVERRIDE;
   virtual bool UsesNativeSystemMenu() const OVERRIDE;
 
-  // Overridden from views::DesktopRootWindowHostX11:
-  virtual aura::RootWindow* Init(
-      aura::Window* content_window,
-      const views::Widget::InitParams& params) OVERRIDE;
-  virtual void CloseNow() OVERRIDE;
-
-  BrowserView* browser_view_;
-
-  // Each browser frame maintains its own menu bar object because the lower
-  // level dbus protocol associates a xid to a menu bar; we can't map multiple
-  // xids to the same menu bar.
-  scoped_ptr<GlobalMenuBarX11> global_menu_bar_x11_;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserDesktopRootWindowHostX11);
 };
 
+
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_