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

Unified Diff: ui/aura/bench/bench_main.cc

Issue 235043005: x11: Remove X11 message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
Index: ui/aura/bench/bench_main.cc
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index 337da8da037916c03844011840bb2e089b2dc836..c6f20b0af65de1737f6cb9fc6532e5beb27bea75 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -33,6 +33,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/skia_util.h"
+#include "ui/gfx/x/x11_connection.h"
#include "ui/gl/gl_surface.h"
#ifndef GL_GLEXT_PROTOTYPES
@@ -40,10 +41,6 @@
#endif
#include "third_party/khronos/GLES2/gl2ext.h"
-#if defined(USE_X11)
-#include "base/message_loop/message_pump_x11.h"
-#endif
-
using base::TimeTicks;
using ui::Compositor;
using ui::Layer;
@@ -294,7 +291,7 @@ int main(int argc, char** argv) {
#if defined(USE_X11)
// This demo uses InProcessContextFactory which uses X on a separate Gpu
// thread.
- XInitThreads();
+ gfx::InitializeX11();
#endif
gfx::GLSurface::InitializeOneOff();
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/demo/demo_main.cc » ('j') | ui/gfx/x/x11_connection.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698