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

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

Issue 31043006: Moves creation of various clients to DesktopNativeWidgetAura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge Created 7 years, 2 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: 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
index b7f3fdbcceae989f0d374e4f129dc3e8f04581d9..c5e52ce1560a490eec78205258a9651f1d9a1a2f 100644
--- 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
@@ -10,11 +10,9 @@
BrowserDesktopRootWindowHostX11::BrowserDesktopRootWindowHostX11(
views::internal::NativeWidgetDelegate* native_widget_delegate,
views::DesktopNativeWidgetAura* desktop_native_widget_aura,
- const gfx::Rect& initial_bounds,
BrowserView* browser_view)
: DesktopRootWindowHostX11(native_widget_delegate,
- desktop_native_widget_aura,
- initial_bounds),
+ desktop_native_widget_aura),
browser_view_(browser_view) {
}
@@ -42,17 +40,16 @@ bool BrowserDesktopRootWindowHostX11::UsesNativeSystemMenu() const {
// BrowserDesktopRootWindowHostX11,
// views::DesktopRootWindowHostX11 implementation:
-aura::RootWindow* BrowserDesktopRootWindowHostX11::Init(
+void BrowserDesktopRootWindowHostX11::Init(
aura::Window* content_window,
- const views::Widget::InitParams& params) {
- aura::RootWindow* root_window = views::DesktopRootWindowHostX11::Init(
- content_window, params);
+ const views::Widget::InitParams& params,
+ aura::RootWindow::CreateParams* rw_create_params) {
+ views::DesktopRootWindowHostX11::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));
-
- return root_window;
}
void BrowserDesktopRootWindowHostX11::CloseNow() {
@@ -68,11 +65,9 @@ BrowserDesktopRootWindowHost*
BrowserDesktopRootWindowHost::CreateBrowserDesktopRootWindowHost(
views::internal::NativeWidgetDelegate* native_widget_delegate,
views::DesktopNativeWidgetAura* desktop_native_widget_aura,
- const gfx::Rect& initial_bounds,
BrowserView* browser_view,
BrowserFrame* browser_frame) {
return new BrowserDesktopRootWindowHostX11(native_widget_delegate,
desktop_native_widget_aura,
- initial_bounds,
browser_view);
}

Powered by Google App Engine
This is Rietveld 408576698