Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h

Issue 22455002: linux_aura: Implement the static part of the dbus menu for Unity. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: The gyp fix Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.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_x11.h
index 3461ebf2635432ae8826ee7297b11f4c004b2143..52aa8d74be0134aa858cda8a1b507990d5033dc2 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_x11.h
@@ -7,6 +7,7 @@
#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;
@@ -22,7 +23,8 @@ class BrowserDesktopRootWindowHostX11
BrowserDesktopRootWindowHostX11(
views::internal::NativeWidgetDelegate* native_widget_delegate,
views::DesktopNativeWidgetAura* desktop_native_widget_aura,
- const gfx::Rect& initial_bounds);
+ const gfx::Rect& initial_bounds,
+ BrowserView* browser_view);
virtual ~BrowserDesktopRootWindowHostX11();
private:
@@ -31,8 +33,20 @@ class BrowserDesktopRootWindowHostX11
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_
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698