| Index: ui/aura/mus/gpu_service.h
|
| diff --git a/services/ui/public/cpp/gpu_service.h b/ui/aura/mus/gpu_service.h
|
| similarity index 86%
|
| copy from services/ui/public/cpp/gpu_service.h
|
| copy to ui/aura/mus/gpu_service.h
|
| index 79b3893bc0cfbc961e32719783e6c97568125cbb..c20239c1748eba94ab9c0e067eeef16830d9e029 100644
|
| --- a/services/ui/public/cpp/gpu_service.h
|
| +++ b/ui/aura/mus/gpu_service.h
|
| @@ -2,8 +2,8 @@
|
| // 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_SERVICE_H_
|
| -#define SERVICES_UI_PUBLIC_CPP_GPU_SERVICE_H_
|
| +#ifndef UI_AURA_MUS_GPU_SERVICE_H_
|
| +#define UI_AURA_MUS_GPU_SERVICE_H_
|
|
|
| #include <stdint.h>
|
| #include <vector>
|
| @@ -15,18 +15,18 @@
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/threading/thread.h"
|
| #include "gpu/ipc/client/gpu_channel_host.h"
|
| -#include "gpu/ipc/common/gpu_info.mojom.h"
|
| -#include "services/ui/public/cpp/mojo_gpu_memory_buffer_manager.h"
|
| #include "services/ui/public/interfaces/gpu_service.mojom.h"
|
| +#include "ui/aura/aura_export.h"
|
| +#include "ui/aura/mus/mojo_gpu_memory_buffer_manager.h"
|
|
|
| namespace service_manager {
|
| class Connector;
|
| }
|
|
|
| -namespace ui {
|
| +namespace aura {
|
|
|
| -class GpuService : public gpu::GpuChannelHostFactory,
|
| - public gpu::GpuChannelEstablishFactory {
|
| +class AURA_EXPORT GpuService : public gpu::GpuChannelHostFactory,
|
| + public gpu::GpuChannelEstablishFactory {
|
| public:
|
| ~GpuService() override;
|
|
|
| @@ -79,6 +79,6 @@ class GpuService : public gpu::GpuChannelHostFactory,
|
| DISALLOW_COPY_AND_ASSIGN(GpuService);
|
| };
|
|
|
| -} // namespace ui
|
| +} // namespace aura
|
|
|
| -#endif // SERVICES_UI_PUBLIC_CPP_GPU_SERVICE_H_
|
| +#endif // UI_AURA_MUS_GPU_SERVICE_H_
|
|
|