Change NativeBufferOzone to be an object and move the overlay calls to the surface object.

ui/ozone/public/surface_factory_ozone.cc

 // Copyright (c) 2013 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/public/surface_factory_ozone.h"
 
 #include <stdlib.h>
 
 #include "base/command_line.h"
+#include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
 namespace ui {
 
 // static
 SurfaceFactoryOzone* SurfaceFactoryOzone::impl_ = NULL;
 
 SurfaceFactoryOzone::SurfaceFactoryOzone() {
   CHECK(!impl_) << "There should only be a single SurfaceFactoryOzone.";
@@ skipping 29 matching lines @@
 const int32* SurfaceFactoryOzone::GetEGLSurfaceProperties(
     const int32* desired_attributes) {
   return desired_attributes;
 }
 
 ui::OverlayCandidatesOzone* SurfaceFactoryOzone::GetOverlayCandidates(
     gfx::AcceleratedWidget w) {
   return NULL;
 }
 
-void SurfaceFactoryOzone::ScheduleOverlayPlane(
-    gfx::AcceleratedWidget w,
-    int plane_z_order,
-    gfx::OverlayTransform plane_transform,
-    ui::NativeBufferOzone buffer,
-    const gfx::Rect& display_bounds,
-    gfx::RectF crop_rect) {
-  NOTREACHED();
+scoped_refptr<ui::NativePixmap> SurfaceFactoryOzone::CreateNativePixmap(
+    gfx::Size size,
+    BufferFormat format) {
+  return NULL;
 }
 
-ui::NativeBufferOzone SurfaceFactoryOzone::CreateNativeBuffer(
-    gfx::Size size,
-    BufferFormat format) {
-  return 0;
+bool SurfaceFactoryOzone::CanShowPrimaryPlaneAsOverlay() {
+  return false;
 }
-
 }  // namespace ui