| Index: ui/aura/mus/gpu_memory_buffer_impl.h
|
| diff --git a/services/ui/public/cpp/gpu_memory_buffer_impl.h b/ui/aura/mus/gpu_memory_buffer_impl.h
|
| similarity index 85%
|
| copy from services/ui/public/cpp/gpu_memory_buffer_impl.h
|
| copy to ui/aura/mus/gpu_memory_buffer_impl.h
|
| index 9ff185299b0109486d2a6150b3134691b27dad30..4f8534778f9c8bfe3de8cd0a685996660928604f 100644
|
| --- a/services/ui/public/cpp/gpu_memory_buffer_impl.h
|
| +++ b/ui/aura/mus/gpu_memory_buffer_impl.h
|
| @@ -2,14 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SERVICES_UI_PUBLIC_CPP_GPU_MEMORY_BUFFER_IMPL_H_
|
| -#define SERVICES_UI_PUBLIC_CPP_GPU_MEMORY_BUFFER_IMPL_H_
|
| +#ifndef UI_AURA_MUS_CPP_GPU_MEMORY_BUFFER_IMPL_H_
|
| +#define UI_AURA_MUS_CPP_GPU_MEMORY_BUFFER_IMPL_H_
|
|
|
| #include <memory>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "gpu/command_buffer/common/sync_token.h"
|
| #include "ui/gfx/geometry/size.h"
|
| #include "ui/gfx/gpu_memory_buffer.h"
|
|
|
| @@ -17,7 +16,7 @@
|
| #include "ui/ozone/public/native_pixmap.h"
|
| #endif
|
|
|
| -namespace ui {
|
| +namespace aura {
|
|
|
| // Provides common implementation of a GPU memory buffer.
|
| class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
|
| @@ -55,6 +54,6 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
|
| DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferImpl);
|
| };
|
|
|
| -} // namespace ui
|
| +} // namespace aura
|
|
|
| -#endif // SERVICES_UI_PUBLIC_CPP_GPU_MEMORY_BUFFER_IMPL_H_
|
| +#endif // UI_AURA_MUS_CPP_GPU_MEMORY_BUFFER_IMPL_H_
|
|
|