Move a bunch of random other files to src/ui/base...

app/gfx/gl/gl_context_linux.cc

 // Copyright (c) 2010 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.
 
 // This file implements the ViewGLContext and PbufferGLContext classes.
 
 #include "app/gfx/gl/gl_context.h"
 
 extern "C" {
 #include <X11/Xlib.h>
 }
 
 #include <GL/osmesa.h>
 
 #include "app/gfx/gl/gl_bindings.h"
 #include "app/gfx/gl/gl_context_egl.h"
 #include "app/gfx/gl/gl_context_osmesa.h"
 #include "app/gfx/gl/gl_context_stub.h"
 #include "app/gfx/gl/gl_implementation.h"
-#include "app/x11_util.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
+#include "ui/base/x/x11_util.h"
 
 namespace {
 
 Display* GetXDisplayHelper() {
   static Display* display = NULL;
 
   if (!display) {
     display = XOpenDisplay(NULL);
     CHECK(display);
   }
@@ skipping 379 matching lines @@
     return false;
   }
 
   gfx::Size size = osmesa_context_.GetSize();
 
   Display* display = GetXDisplayHelper();
 
   // Copy the frame into the pixmap.
   XWindowAttributes attributes;
   XGetWindowAttributes(display, window_, &attributes);
-  x11_util::PutARGBImage(display,
-                         attributes.visual,
-                         attributes.depth,
-                         pixmap_,
-                         pixmap_graphics_context_,
-                         static_cast<const uint8*>(osmesa_context_.buffer()),
-                         size.width(),
-                         size.height());
+  ui::PutARGBImage(display,
+                   attributes.visual,
+                   attributes.depth,
+                   pixmap_,
+                   pixmap_graphics_context_,
+                   static_cast<const uint8*>(osmesa_context_.buffer()),
+                   size.width(),
+                   size.height());
 
   // Copy the pixmap to the window.
   XCopyArea(display,
             pixmap_,
             window_,
             window_graphics_context_,
             0, 0,
             size.width(), size.height(),
             0, 0);
 
@@ skipping 379 matching lines @@
     }
     case kGLImplementationMockGL:
       return new StubGLContext;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace gfx