chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.h - Issue 31043006: Moves creation of various clients to DesktopNativeWidgetAura

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

« no previous file with comments | « chrome/browser/ui/views/frame/browser_desktop_root_window_host_win.cc ('k') | chrome/browser/ui/views/frame/browser_desktop_root_window_host_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 52aa8d74be0134aa858cda8a1b507990d5033dc2..b7355c847800d4f1afda8af7e96786a4b4af49c9 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

@@ -23,7 +23,6 @@ class BrowserDesktopRootWindowHostX11

BrowserDesktopRootWindowHostX11(

views::internal::NativeWidgetDelegate* native_widget_delegate,

views::DesktopNativeWidgetAura* desktop_native_widget_aura,

- const gfx::Rect& initial_bounds,

BrowserView* browser_view);

virtual ~BrowserDesktopRootWindowHostX11();

@@ -34,9 +33,10 @@ class BrowserDesktopRootWindowHostX11

virtual bool UsesNativeSystemMenu() const OVERRIDE;

// Overridden from views::DesktopRootWindowHostX11:

- virtual aura::RootWindow* Init(

+ virtual void Init(

aura::Window* content_window,

- const views::Widget::InitParams& params) OVERRIDE;

+ const views::Widget::InitParams& params,

+ aura::RootWindow::CreateParams* rw_create_params) OVERRIDE;

virtual void CloseNow() OVERRIDE;

BrowserView* browser_view_;