content/browser/browser_main_loop.cc - Issue 235043005: x11: Remove X11 message-pump.

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: content/browser/browser_main_loop.cc

Issue 235043005: x11: Remove X11 message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tot-merge Created 6 years, 8 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:

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 70f08120da750165a5054aa2aa4d894fab047ea7..022994434bd8f88f81c8055ae3b3be1be2d04c3f 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -111,7 +111,7 @@

#endif

#if defined(USE_X11)

-#include <X11/Xlib.h>

+#include "ui/gfx/x/x11_connection.h"

#endif

#if defined(USE_OZONE)

@@ -363,7 +363,7 @@ void BrowserMainLoop::EarlyInitialization() {

#if defined(USE_X11)

if (parsed_command_line_.HasSwitch(switches::kSingleProcess) ||

parsed_command_line_.HasSwitch(switches::kInProcessGPU)) {

- if (!XInitThreads()) {

+ if (!gfx::InitializeThreadedX11()) {

LOG(ERROR) << "Failed to put Xlib into threaded mode.";

}