| Index: content/common/gpu/client/gpu_channel_host.h
|
| diff --git a/content/common/gpu/client/gpu_channel_host.h b/content/common/gpu/client/gpu_channel_host.h
|
| index ad56d18d85a13aca16672a2eb0d79794a3808277..e85db1ea26d373fe7ec7861e0dccf9605a6fadb5 100644
|
| --- a/content/common/gpu/client/gpu_channel_host.h
|
| +++ b/content/common/gpu/client/gpu_channel_host.h
|
| @@ -47,7 +47,7 @@ class VideoDecodeAccelerator;
|
| class VideoEncodeAccelerator;
|
| }
|
|
|
| -namespace cc {
|
| +namespace gpu {
|
| class GpuMemoryBufferManager;
|
| }
|
|
|
| @@ -90,7 +90,7 @@ class GpuChannelHost : public IPC::Sender,
|
| const gpu::GPUInfo& gpu_info,
|
| const IPC::ChannelHandle& channel_handle,
|
| base::WaitableEvent* shutdown_event,
|
| - cc::GpuMemoryBufferManager* gpu_memory_buffer_manager);
|
| + gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
|
|
|
| bool IsLost() const {
|
| DCHECK(channel_filter_.get());
|
| @@ -136,7 +136,7 @@ class GpuChannelHost : public IPC::Sender,
|
|
|
| GpuChannelHostFactory* factory() const { return factory_; }
|
|
|
| - cc::GpuMemoryBufferManager* gpu_memory_buffer_manager() const {
|
| + gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager() const {
|
| return gpu_memory_buffer_manager_;
|
| }
|
|
|
| @@ -165,7 +165,7 @@ class GpuChannelHost : public IPC::Sender,
|
| friend class base::RefCountedThreadSafe<GpuChannelHost>;
|
| GpuChannelHost(GpuChannelHostFactory* factory,
|
| const gpu::GPUInfo& gpu_info,
|
| - cc::GpuMemoryBufferManager* gpu_memory_buffer_manager);
|
| + gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
|
| ~GpuChannelHost() override;
|
| void Connect(const IPC::ChannelHandle& channel_handle,
|
| base::WaitableEvent* shutdown_event);
|
| @@ -222,7 +222,7 @@ class GpuChannelHost : public IPC::Sender,
|
| scoped_ptr<IPC::SyncChannel> channel_;
|
| scoped_refptr<MessageFilter> channel_filter_;
|
|
|
| - cc::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
|
| + gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
|
|
|
| // A filter for sending messages from thread other than the main thread.
|
| scoped_refptr<IPC::SyncMessageFilter> sync_filter_;
|
|
|