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

trunk/src/ui/gl/gl_surface_x11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/gl_surface.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "third_party/mesa/src/include/GL/osmesa.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_glx.h"
 #include "ui/gl/gl_surface_osmesa.h"
 #include "ui/gl/gl_surface_stub.h"
 
 namespace gfx {
 
 // This OSMesa GL surface can use XLib to swap the contents of the buffer to a
@@ skipping 49 matching lines @@
     default:
       break;
   }
 
   return true;
 }
 
 NativeViewGLSurfaceOSMesa::NativeViewGLSurfaceOSMesa(
     gfx::AcceleratedWidget window)
     : GLSurfaceOSMesa(OSMESA_BGRA, gfx::Size(1, 1)),
-      xdisplay_(gfx::GetXDisplay()),
+      xdisplay_(base::MessagePumpForUI::GetDefaultXDisplay()),
       window_graphics_context_(0),
       window_(window),
       pixmap_graphics_context_(0),
       pixmap_(0) {
   DCHECK(xdisplay_);
   DCHECK(window_);
 }
 
 // static
 bool NativeViewGLSurfaceOSMesa::InitializeOneOff() {
   static bool initialized = false;
   if (initialized)
     return true;
 
-  if (!gfx::GetXDisplay()) {
+  if (!base::MessagePumpForUI::GetDefaultXDisplay()) {
     LOG(ERROR) << "XOpenDisplay failed.";
     return false;
   }
 
   initialized = true;
   return true;
 }
 
 bool NativeViewGLSurfaceOSMesa::Initialize() {
   if (!GLSurfaceOSMesa::Initialize())
@@ skipping 226 matching lines @@
     }
     case kGLImplementationMockGL:
       return new GLSurfaceStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
-  return gfx::GetXDisplay();
+  return base::MessagePumpForUI::GetDefaultXDisplay();
 }
 
 }  // namespace gfx