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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/browser/browser_main_loop.cc

Issue 238093002: Revert 263726 "x11: Remove X11 message-pump." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc ('k') | trunk/src/content/browser/power_save_blocker_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/browser/browser_main_loop.cc
===================================================================
--- trunk/src/content/browser/browser_main_loop.cc (revision 263732)
+++ trunk/src/content/browser/browser_main_loop.cc (working copy)
@@ -111,7 +111,7 @@
#endif
#if defined(USE_X11)
-#include "ui/gfx/x/x11_connection.h"
+#include <X11/Xlib.h>
#endif
#if defined(USE_OZONE)
@@ -363,7 +363,7 @@
#if defined(USE_X11)
if (parsed_command_line_.HasSwitch(switches::kSingleProcess) ||
parsed_command_line_.HasSwitch(switches::kInProcessGPU)) {
- if (!gfx::InitializeThreadedX11()) {
+ if (!XInitThreads()) {
LOG(ERROR) << "Failed to put Xlib into threaded mode.";
}
}
« no previous file with comments | « trunk/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc ('k') | trunk/src/content/browser/power_save_blocker_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698