| Index: ui/ozone/public/surface_factory_ozone.cc
|
| diff --git a/ui/gfx/ozone/surface_factory_ozone.cc b/ui/ozone/public/surface_factory_ozone.cc
|
| similarity index 77%
|
| rename from ui/gfx/ozone/surface_factory_ozone.cc
|
| rename to ui/ozone/public/surface_factory_ozone.cc
|
| index a1dbdd121dfd7cf284d9f372c1eac8eddfd3826c..9d33be43524b2952e1a518660a89edd7485f9985 100644
|
| --- a/ui/gfx/ozone/surface_factory_ozone.cc
|
| +++ b/ui/ozone/public/surface_factory_ozone.cc
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ui/gfx/ozone/surface_factory_ozone.h"
|
| +#include "ui/ozone/public/surface_factory_ozone.h"
|
|
|
| #include <stdlib.h>
|
|
|
| #include "base/command_line.h"
|
| -#include "ui/gfx/ozone/surface_ozone_canvas.h"
|
| -#include "ui/gfx/ozone/surface_ozone_egl.h"
|
| +#include "ui/ozone/public/surface_ozone_canvas.h"
|
| +#include "ui/ozone/public/surface_ozone_egl.h"
|
|
|
| -namespace gfx {
|
| +namespace ui {
|
|
|
| // static
|
| SurfaceFactoryOzone* SurfaceFactoryOzone::impl_ = NULL;
|
| @@ -35,13 +35,13 @@ intptr_t SurfaceFactoryOzone::GetNativeDisplay() {
|
| }
|
|
|
| scoped_ptr<SurfaceOzoneEGL> SurfaceFactoryOzone::CreateEGLSurfaceForWidget(
|
| - gfx::AcceleratedWidget widget) {
|
| + gfx::AcceleratedWidget widget) {
|
| NOTIMPLEMENTED();
|
| return scoped_ptr<SurfaceOzoneEGL>();
|
| }
|
|
|
| scoped_ptr<SurfaceOzoneCanvas> SurfaceFactoryOzone::CreateCanvasForWidget(
|
| - gfx::AcceleratedWidget widget) {
|
| + gfx::AcceleratedWidget widget) {
|
| NOTIMPLEMENTED();
|
| return scoped_ptr<SurfaceOzoneCanvas>();
|
| }
|
| @@ -51,8 +51,7 @@ const int32* SurfaceFactoryOzone::GetEGLSurfaceProperties(
|
| return desired_attributes;
|
| }
|
|
|
| -
|
| -gfx::OverlayCandidatesOzone* SurfaceFactoryOzone::GetOverlayCandidates(
|
| +ui::OverlayCandidatesOzone* SurfaceFactoryOzone::GetOverlayCandidates(
|
| gfx::AcceleratedWidget w) {
|
| return NULL;
|
| }
|
| @@ -61,16 +60,16 @@ void SurfaceFactoryOzone::ScheduleOverlayPlane(
|
| gfx::AcceleratedWidget w,
|
| int plane_z_order,
|
| gfx::OverlayTransform plane_transform,
|
| - gfx::NativeBufferOzone buffer,
|
| + ui::NativeBufferOzone buffer,
|
| const gfx::Rect& display_bounds,
|
| gfx::RectF crop_rect) {
|
| NOTREACHED();
|
| }
|
|
|
| -gfx::NativeBufferOzone SurfaceFactoryOzone::CreateNativeBuffer(
|
| +ui::NativeBufferOzone SurfaceFactoryOzone::CreateNativeBuffer(
|
| gfx::Size size,
|
| BufferFormat format) {
|
| return 0;
|
| }
|
|
|
| -} // namespace gfx
|
| +} // namespace ui
|
|
|