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

Unified Diff: trunk/src/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc

Issue 22326003: Revert 215769 "linux_aura: Implement the static part of the dbus..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
Index: trunk/src/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc (revision 215779)
+++ trunk/src/chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc (working copy)
@@ -10,12 +10,10 @@
BrowserDesktopRootWindowHostX11::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)
: DesktopRootWindowHostX11(native_widget_delegate,
- desktop_native_widget_aura,
- initial_bounds),
- browser_view_(browser_view) {
+ desktop_native_widget_aura,
+ initial_bounds) {
}
BrowserDesktopRootWindowHostX11::~BrowserDesktopRootWindowHostX11() {
@@ -39,28 +37,6 @@
}
////////////////////////////////////////////////////////////////////////////////
-// BrowserDesktopRootWindowHostX11,
-// views::DesktopRootWindowHostX11 implementation:
-
-aura::RootWindow* BrowserDesktopRootWindowHostX11::Init(
- aura::Window* content_window,
- const views::Widget::InitParams& params) {
- aura::RootWindow* root_window = views::DesktopRootWindowHostX11::Init(
- content_window, 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));
-
- return root_window;
-}
-
-void BrowserDesktopRootWindowHostX11::CloseNow() {
- global_menu_bar_x11_.reset();
- DesktopRootWindowHostX11::CloseNow();
-}
-
-////////////////////////////////////////////////////////////////////////////////
// BrowserDesktopRootWindowHost, public:
// static
@@ -72,7 +48,6 @@
BrowserView* browser_view,
BrowserFrame* browser_frame) {
return new BrowserDesktopRootWindowHostX11(native_widget_delegate,
- desktop_native_widget_aura,
- initial_bounds,
- browser_view);
+ desktop_native_widget_aura,
+ initial_bounds);
}

Powered by Google App Engine
This is Rietveld 408576698