views: Support Desktop Aura creation on Ozone

chrome/browser/ui/views/frame/browser_desktop_root_window_host_ozone.h

Index: chrome/browser/ui/views/frame/browser_desktop_root_window_host_ozone.h
diff --git a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h b/chrome/browser/ui/views/frame/browser_desktop_root_window_host_ozone.h
similarity index 54%
copy from chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h
copy to chrome/browser/ui/views/frame/browser_desktop_root_window_host_ozone.h
index b7355c847800d4f1afda8af7e96786a4b4af49c9..5b1cbf0cf2ce57de9f3166892b088571c570ba0f 100644
--- a/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h
+++ b/chrome/browser/ui/views/frame/browser_desktop_root_window_host_ozone.h
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_
-#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_OZONE_H_
+#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_OZONE_H_
 
-#include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
+#include "ui/aura/root_window_host.h"
+#include "ui/views/widget/desktop_aura/desktop_root_window_host.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;
@@ -16,23 +16,22 @@ namespace views {
 class DesktopNativeWidgetAura;
 }
 
-class BrowserDesktopRootWindowHostX11
-    : public BrowserDesktopRootWindowHost,
-      public views::DesktopRootWindowHostX11 {
+class BrowserDesktopRootWindowHostOzone
+    : public BrowserDesktopRootWindowHost {
  public:
-  BrowserDesktopRootWindowHostX11(
+  BrowserDesktopRootWindowHostOzone(
       views::internal::NativeWidgetDelegate* native_widget_delegate,
       views::DesktopNativeWidgetAura* desktop_native_widget_aura,
       BrowserView* browser_view);
-  virtual ~BrowserDesktopRootWindowHostX11();
+  virtual ~BrowserDesktopRootWindowHostOzone();
 
  private:
   // Overridden from BrowserDesktopRootWindowHost:
-  virtual DesktopRootWindowHost* AsDesktopRootWindowHost() OVERRIDE;
+  virtual views::DesktopRootWindowHost* AsDesktopRootWindowHost() OVERRIDE;
   virtual int GetMinimizeButtonOffset() const OVERRIDE;
   virtual bool UsesNativeSystemMenu() const OVERRIDE;
 
-  // Overridden from views::DesktopRootWindowHostX11:
+  // Overridden from views::DesktopRootWindowHostOzone:
   virtual void Init(
       aura::Window* content_window,
       const views::Widget::InitParams& params,
@@ -41,12 +40,10 @@ class BrowserDesktopRootWindowHostX11
 
   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_;
+  // Ownership passed to RootWindow on Init.
+  views::DesktopRootWindowHost* desktop_root_window_host_;
 
-  DISALLOW_COPY_AND_ASSIGN(BrowserDesktopRootWindowHostX11);
+  DISALLOW_COPY_AND_ASSIGN(BrowserDesktopRootWindowHostOzone);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_X11_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_DESKTOP_ROOT_WINDOW_HOST_OZONE_H_