Revert 263726 "x11: Remove X11 message-pump."

trunk/src/ui/views/examples/examples_main.cc

Index: trunk/src/ui/views/examples/examples_main.cc
===================================================================
--- trunk/src/ui/views/examples/examples_main.cc	(revision 263732)
+++ trunk/src/ui/views/examples/examples_main.cc	(working copy)
@@ -2,6 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#if defined(USE_X11)
+#include <X11/Xlib.h>
+#endif
+
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -23,15 +27,10 @@
 #if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #endif
-
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
-#if defined(USE_X11)
-#include "ui/gfx/x/x11_connection.h"
-#endif
-
 int main(int argc, char** argv) {
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
@@ -44,7 +43,7 @@
 #if defined(USE_X11)
   // This demo uses InProcessContextFactory which uses X on a separate Gpu
   // thread.
-  gfx::InitializeThreadedX11();
+  XInitThreads();
 #endif
 
   gfx::GLSurface::InitializeOneOff();