ui: Move gl/ directory out of gfx/, up to ui/.

content/common/gpu/image_transport_surface_linux.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 "content/common/gpu/image_transport_surface.h"
 
 // This conflicts with the defines in Xlib.h and must come first.
 #include "content/common/gpu/gpu_messages.h"
 
+#include <X11/Xlib.h>
+#include <X11/extensions/Xcomposite.h>
 #include <map>
 #include <vector>
-#include <X11/Xlib.h>
-#include <X11/extensions/Xcomposite.h>
 
 // Note: these must be included before anything that includes gl_bindings.h
 // They're effectively standard library headers.
 #include "third_party/khronos/EGL/egl.h"
 #include "third_party/khronos/EGL/eglext.h"
 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
 
 #include "base/bind.h"
+#include "base/debug/trace_event.h"
 #include "base/memory/weak_ptr.h"
-#include "base/debug/trace_event.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/texture_image_transport_surface.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
-#include "ui/gfx/gl/gl_context.h"
-#include "ui/gfx/gl/gl_bindings.h"
-#include "ui/gfx/gl/gl_implementation.h"
-#include "ui/gfx/gl/gl_surface_egl.h"
-#include "ui/gfx/gl/gl_surface_glx.h"
-#include "ui/gfx/gl/gl_surface_osmesa.h"
 #include "ui/gfx/rect.h"
+#include "ui/gl/gl_bindings.h"
+#include "ui/gl/gl_context.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"
 
 namespace {
 
 class ScopedDisplayLock {
  public:
   ScopedDisplayLock(Display* display): display_(display) {
     XLockDisplay(display_);
   }
 
   ~ScopedDisplayLock() {
@@ skipping 893 matching lines @@
                                                    stub,
                                                    surface.get(),
                                                    handle.transport);
   }
 
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }