chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc - Issue 273073002: Changes code using Compositor to pass in ContextFactory

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_window_tree_host_x11.cc

Issue 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix tooltip on chromeos Created 6 years, 7 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_window_tree_host_x11.h ('k') | chrome/test/base/browser_with_test_window_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc

diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc

index 49f9ae2e4166716971f2b1edf6a3551926d30e4c..edf71d5213f1ade1345ad788c1d5fb1db18ff0a3 100644

--- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc

+++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.cc

@@ -42,8 +42,10 @@ bool BrowserDesktopWindowTreeHostX11::UsesNativeSystemMenu() const {

void BrowserDesktopWindowTreeHostX11::Init(

aura::Window* content_window,

- const views::Widget::InitParams& params) {

- views::DesktopWindowTreeHostX11::Init(content_window, params);

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

+ ui::ContextFactory* context_factory) {

+ views::DesktopWindowTreeHostX11::Init(content_window, params,

+ context_factory);

// We have now created our backing X11 window. We now need to (possibly)

// alert Unity that there's a menu bar attached to it.