ozone: Move the factory interfaces into a common target.

ui/gl/gl_surface_ozone.cc

 // Copyright 2014 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/logging.h"
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/ozone/surface_factory_ozone.h"
-#include "ui/gfx/ozone/surface_ozone_egl.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_osmesa.h"
 #include "ui/gl/gl_surface_stub.h"
+#include "ui/ozone/factories/surface_factory_ozone.h"
+#include "ui/ozone/factories/surface_ozone_egl.h"
 
 namespace gfx {
 
 namespace {
 
 // A thin wrapper around GLSurfaceEGL that owns the EGLNativeWindow
 class GL_EXPORT GLSurfaceOzoneEGL : public NativeViewGLSurfaceEGL {
  public:
-  GLSurfaceOzoneEGL(scoped_ptr<SurfaceOzoneEGL> ozone_surface)
+  GLSurfaceOzoneEGL(scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface)
       : NativeViewGLSurfaceEGL(ozone_surface->GetNativeWindow()),
         ozone_surface_(ozone_surface.Pass()) {}
 
   virtual bool Resize(const gfx::Size& size) OVERRIDE {
     if (!ozone_surface_->ResizeNativeWindow(size))
       return false;
 
     return NativeViewGLSurfaceEGL::Resize(size);
   }
   virtual bool SwapBuffers() OVERRIDE {
     if (!NativeViewGLSurfaceEGL::SwapBuffers())
       return false;
 
     return ozone_surface_->OnSwapBuffers();
   }
 
  private:
   virtual ~GLSurfaceOzoneEGL() {
     Destroy();  // EGL surface must be destroyed before SurfaceOzone
   }
 
   // The native surface. Deleting this is allowed to free the EGLNativeWindow.
-  scoped_ptr<SurfaceOzoneEGL> ozone_surface_;
+  scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceOzoneEGL);
 };
 
 }  // namespace
 
 // static
 bool GLSurface::InitializeOneOffInternal() {
   switch (GetGLImplementation()) {
     case kGLImplementationEGLGLES2:
-      if (gfx::SurfaceFactoryOzone::GetInstance()->InitializeHardware() !=
-          gfx::SurfaceFactoryOzone::INITIALIZED) {
+      if (ui::SurfaceFactoryOzone::GetInstance()->InitializeHardware() !=
+          ui::SurfaceFactoryOzone::INITIALIZED) {
         LOG(ERROR) << "Ozone failed to initialize hardware";
         return false;
       }
 
       if (!GLSurfaceEGL::InitializeOneOff()) {
         LOG(ERROR) << "GLSurfaceEGL::InitializeOneOff failed.";
         return false;
       }
 
       return true;
     case kGLImplementationOSMesaGL:
     case kGLImplementationMockGL:
       return true;
     default:
       return false;
   }
 }
 
 // static
 scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
     gfx::AcceleratedWidget window) {
   if (GetGLImplementation() == kGLImplementationOSMesaGL) {
     scoped_refptr<GLSurface> surface(new GLSurfaceOSMesaHeadless());
     if (!surface->Initialize())
       return NULL;
     return surface;
   }
   DCHECK(GetGLImplementation() == kGLImplementationEGLGLES2);
   if (window != kNullAcceleratedWidget) {
-    scoped_ptr<SurfaceOzoneEGL> surface_ozone =
-        SurfaceFactoryOzone::GetInstance()->CreateEGLSurfaceForWidget(window);
+    scoped_ptr<ui::SurfaceOzoneEGL> surface_ozone =
+        ui::SurfaceFactoryOzone::GetInstance()->CreateEGLSurfaceForWidget(
+            window);
     if (!surface_ozone)
       return NULL;
 
     scoped_ptr<VSyncProvider> vsync_provider =
         surface_ozone->CreateVSyncProvider();
     scoped_refptr<GLSurfaceOzoneEGL> surface =
         new GLSurfaceOzoneEGL(surface_ozone.Pass());
     if (!surface->Initialize(vsync_provider.Pass()))
       return NULL;
     return surface;
@@ skipping 28 matching lines @@
         return NULL;
       return surface;
     }
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
-  return SurfaceFactoryOzone::GetInstance()->GetNativeDisplay();
+  return ui::SurfaceFactoryOzone::GetInstance()->GetNativeDisplay();
 }
 
 }  // namespace gfx