Move code in ui/gl/* from gfx:: to gl::

ui/gl/gl_surface_glx.h

 // 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.
 
 #ifndef UI_GL_GL_SURFACE_GLX_H_
 #define UI_GL_GL_SURFACE_GLX_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/gl/gl_export.h"
 #include "ui/gl/gl_surface.h"
 
-namespace gfx {
+namespace gl {
 
 // Base class for GLX surfaces.
 class GL_EXPORT GLSurfaceGLX : public GLSurface {
  public:
   GLSurfaceGLX();
 
   static bool InitializeOneOff();
 
   // These aren't particularly tied to surfaces, but since we already
   // have the static InitializeOneOff here, it's easiest to reuse its
@@ skipping 30 matching lines @@
   bool Resize(const gfx::Size& size,
               float scale_factor,
               bool has_alpha) override;
   bool IsOffscreen() override;
   gfx::SwapResult SwapBuffers() override;
   gfx::Size GetSize() override;
   void* GetHandle() override;
   bool SupportsPostSubBuffer() override;
   void* GetConfig() override;
   gfx::SwapResult PostSubBuffer(int x, int y, int width, int height) override;
-  VSyncProvider* GetVSyncProvider() override;
+  gfx::VSyncProvider* GetVSyncProvider() override;
 
  protected:
   ~NativeViewGLSurfaceGLX() override;
 
  private:
   // The handle for the drawable to make current or swap.
   GLXDrawable GetDrawableHandle() const;
 
   // PlatformEventDispatcher implementation
   bool CanDispatchEvent(const ui::PlatformEvent& event) override;
   uint32_t DispatchEvent(const ui::PlatformEvent& event) override;
 
   // Window passed in at creation. Always valid.
   gfx::AcceleratedWidget parent_window_;
 
   // Child window, used to control resizes so that they're in-order with GL.
   gfx::AcceleratedWidget window_;
 
   // GLXDrawable for the window.
   GLXWindow glx_window_;
 
   GLXFBConfig config_;
   gfx::Size size_;
 
-  std::unique_ptr<VSyncProvider> vsync_provider_;
+  std::unique_ptr<gfx::VSyncProvider> vsync_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewGLSurfaceGLX);
 };
 
 // A surface used to render to an offscreen pbuffer.
 class GL_EXPORT UnmappedNativeViewGLSurfaceGLX : public GLSurfaceGLX {
  public:
   explicit UnmappedNativeViewGLSurfaceGLX(const gfx::Size& size);
 
   // Implement GLSurfaceGLX.
@@ skipping 13 matching lines @@
   GLXFBConfig config_;
   // Unmapped dummy window, used to provide a compatible surface.
   gfx::AcceleratedWidget window_;
 
   // GLXDrawable for the window.
   GLXWindow glx_window_;
 
   DISALLOW_COPY_AND_ASSIGN(UnmappedNativeViewGLSurfaceGLX);
 };
 
-}  // namespace gfx
+}  // namespace gl
 
 #endif  // UI_GL_GL_SURFACE_GLX_H_