summaryrefslogtreecommitdiffstats
path: root/ui/aura/bench/bench_main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ui/aura/bench/bench_main.cc')
-rw-r--r--ui/aura/bench/bench_main.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index c5b98c0..337da8d 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -33,7 +33,6 @@
#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
@@ -41,6 +40,10 @@
#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;
@@ -291,7 +294,7 @@ int main(int argc, char** argv) {
#if defined(USE_X11)
// This demo uses InProcessContextFactory which uses X on a separate Gpu
// thread.
- gfx::InitializeThreadedX11();
+ XInitThreads();
#endif
gfx::GLSurface::InitializeOneOff();