| Index: media/gpu/ipc/service/media_channel.h
|
| diff --git a/content/common/gpu/media/media_channel.h b/media/gpu/ipc/service/media_channel.h
|
| similarity index 84%
|
| rename from content/common/gpu/media/media_channel.h
|
| rename to media/gpu/ipc/service/media_channel.h
|
| index 7f0bca854e7e1944ed548c5d34dcba9774de9624..ae933bf201fa06bd8b0549f19e937a0d4f1371e7 100644
|
| --- a/content/common/gpu/media/media_channel.h
|
| +++ b/media/gpu/ipc/service/media_channel.h
|
| @@ -2,12 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_
|
| -#define CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_
|
| +#ifndef MEDIA_GPU_IPC_SERVICE_MEDIA_CHANNEL_H_
|
| +#define MEDIA_GPU_IPC_SERVICE_MEDIA_CHANNEL_H_
|
|
|
| -#include "content/common/gpu/media/gpu_jpeg_decode_accelerator.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "ipc/ipc_sender.h"
|
| +#include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
|
| #include "media/video/video_decode_accelerator.h"
|
|
|
| namespace media {
|
| @@ -19,7 +19,7 @@ class GpuChannel;
|
| class GpuCommandBufferStub;
|
| }
|
|
|
| -namespace content {
|
| +namespace media {
|
|
|
| class MediaChannelDispatchHelper;
|
|
|
| @@ -52,6 +52,6 @@ class MediaChannel : public IPC::Listener, public IPC::Sender {
|
| DISALLOW_COPY_AND_ASSIGN(MediaChannel);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace media
|
|
|
| -#endif // CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_
|
| +#endif // MEDIA_GPU_IPC_SERVICE_MEDIA_CHANNEL_H_
|
|
|