Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: content/common/gpu/media/gpu_video_decode_accelerator.h

Issue 269673005: media: Add MediaOzonePlatform support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix up dependency cycle Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/media/gpu_video_decode_accelerator.h
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
index a93559ef8dd8f3b473d17cc0f568706330578c56..6f91c82e12adac0e3545ffe4a6f206646c35e742 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.h
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
@@ -13,10 +13,10 @@
#include "base/memory/shared_memory.h"
#include "base/synchronization/waitable_event.h"
#include "content/common/gpu/gpu_command_buffer_stub.h"
-#include "content/common/gpu/media/video_decode_accelerator_impl.h"
#include "gpu/command_buffer/service/texture_manager.h"
#include "ipc/ipc_listener.h"
#include "ipc/ipc_sender.h"
+#include "media/types/video_decode_accelerator_impl.h"
#include "media/video/video_decode_accelerator.h"
#include "ui/gfx/size.h"
@@ -98,7 +98,7 @@ class GpuVideoDecodeAccelerator
GpuCommandBufferStub* stub_;
// The underlying VideoDecodeAccelerator.
- scoped_ptr<VideoDecodeAcceleratorImpl> video_decode_accelerator_;
+ scoped_ptr<media::VideoDecodeAcceleratorImpl> video_decode_accelerator_;
// Callback for making the relevant context current for GL calls.
// Returns false if failed.

Powered by Google App Engine
This is Rietveld 408576698