ozone: Build fixes for gbm & component build

TBR=dnicoara
NOTRY=true

Review URL: https://codereview.chromium.org/348923002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278864 0039d316-1c4b-4281-b951-d872f2087c98

ui/aura/aura.gyp

@@ -133,6 +133,7 @@
           'dependencies': [
             '../events/ozone/events_ozone.gyp:events_ozone',
             '../ozone/ozone.gyp:ozone',
+            '../ozone/ozone.gyp:ozone_base',
           ],
         }],
       ],

ui/gl/gl.gyp

@@ -298,6 +298,7 @@
         ['use_ozone==1', {
           'dependencies': [
             '../ozone/ozone.gyp:ozone',
+            '../ozone/ozone.gyp:ozone_base',
           ],
         }],
         ['OS=="android" and android_webview_build==0', {

ui/ozone/platform/dri/gbm_surface_factory.cc

@@ -152,7 +152,7 @@ scoped_ptr<ui::SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
       new GbmSurfaceAdapter(screen_manager_->GetDisplayController(w)));
 }
 
-gfx::NativeBufferOzone GbmSurfaceFactory::CreateNativeBuffer(
+ui::NativeBufferOzone GbmSurfaceFactory::CreateNativeBuffer(
     gfx::Size size,
     BufferFormat format) {
   uint32_t gbm_format = 0;
@@ -181,7 +181,7 @@ gfx::NativeBufferOzone GbmSurfaceFactory::CreateNativeBuffer(
   BufferData* data = BufferData::CreateData(drm_, buffer_object);
   DCHECK(data) << "Failed to associate the buffer with the controller";
 
-  return reinterpret_cast<gfx::NativeBufferOzone>(buffer_object);
+  return reinterpret_cast<ui::NativeBufferOzone>(buffer_object);
 }
 
 }  // namespace ui

ui/ozone/platform/dri/gbm_surface_factory.h

@@ -27,7 +27,7 @@ class GbmSurfaceFactory : public DriSurfaceFactory {
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE;
   virtual scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
       gfx::AcceleratedWidget w) OVERRIDE;
-  virtual gfx::NativeBufferOzone CreateNativeBuffer(
+  virtual ui::NativeBufferOzone CreateNativeBuffer(
       gfx::Size size,
       BufferFormat format) OVERRIDE;
 

ui/ozone/platform/dri/ozone_platform_gbm.cc

@@ -19,6 +19,8 @@
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/platform/dri/virtual_terminal_manager.h"
 #include "ui/ozone/public/cursor_factory_ozone.h"
+#include "ui/ozone/public/gpu_platform_support.h"
+#include "ui/ozone/public/gpu_platform_support_host.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/ozone/common/chromeos/native_display_delegate_ozone.h"
@@ -79,7 +81,7 @@ class OzonePlatformGbm : public OzonePlatform {
     return cursor_factory_ozone_.get();
   }
   virtual GpuPlatformSupport* GetGpuPlatformSupport() OVERRIDE {
-    return gpu_platform_support_.get()
+    return gpu_platform_support_.get();
   }
   virtual GpuPlatformSupportHost* GetGpuPlatformSupportHost() OVERRIDE {
     return gpu_platform_support_host_.get();