ozone: Move the factory interfaces into a common target.

ui/ozone/platform/caca/caca_surface_factory.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/ozone/platform/caca/caca_surface_factory.h"
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "ui/gfx/ozone/surface_ozone_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/ozone/platform/caca/caca_connection.h"
+#include "ui/ozone/public/surface_ozone_canvas.h"
 
 namespace ui {
 
 namespace {
 
 const gfx::AcceleratedWidget kDefaultWidgetHandle = 1;
 
-class CacaSurface : public gfx::SurfaceOzoneCanvas {
+class CacaSurface : public ui::SurfaceOzoneCanvas {
  public:
   CacaSurface(CacaConnection* connection);
   virtual ~CacaSurface();
 
   bool Initialize();
 
-  // gfx::SurfaceOzoneCanvas overrides:
+  // ui::SurfaceOzoneCanvas overrides:
   virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE;
   virtual void ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE;
   virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE;
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE;
 
  private:
   CacaConnection* connection_;  // Not owned.
 
   caca_dither_t* dither_;
 
@@ skipping 65 matching lines @@
 CacaSurfaceFactory::CacaSurfaceFactory(CacaConnection* connection)
     : state_(UNINITIALIZED),
       connection_(connection) {
 }
 
 CacaSurfaceFactory::~CacaSurfaceFactory() {
   if (state_ == INITIALIZED)
     ShutdownHardware();
 }
 
-gfx::SurfaceFactoryOzone::HardwareState
+ui::SurfaceFactoryOzone::HardwareState
 CacaSurfaceFactory::InitializeHardware() {
   connection_->Initialize();
   state_ = INITIALIZED;
   return state_;
 }
 
 void CacaSurfaceFactory::ShutdownHardware() {
   CHECK_EQ(INITIALIZED, state_);
   state_ = UNINITIALIZED;
 }
 
 gfx::AcceleratedWidget CacaSurfaceFactory::GetAcceleratedWidget() {
   return kDefaultWidgetHandle;
 }
 
 bool CacaSurfaceFactory::LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   NOTREACHED();
   return false;
 }
 
-scoped_ptr<gfx::SurfaceOzoneCanvas> CacaSurfaceFactory::CreateCanvasForWidget(
+scoped_ptr<ui::SurfaceOzoneCanvas> CacaSurfaceFactory::CreateCanvasForWidget(
     gfx::AcceleratedWidget widget) {
   CHECK_EQ(INITIALIZED, state_);
   CHECK_EQ(kDefaultWidgetHandle, widget);
 
   scoped_ptr<CacaSurface> canvas(new CacaSurface(connection_));
   CHECK(canvas->Initialize());
-  return canvas.PassAs<gfx::SurfaceOzoneCanvas>();
+  return canvas.PassAs<ui::SurfaceOzoneCanvas>();
 }
 
 }  // namespace ui