content/renderer/pepper/pepper_platform_video_capture_impl.h - Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/pepper_platform_video_capture_impl.h

Issue 10108009: Move VideoCapture::VideoCaptureCapability to video_capture_types.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix content_unittests build failure Created 8 years, 8 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

« no previous file with comments | « content/renderer/media/video_capture_module_impl.cc ('k') | content/renderer/pepper/pepper_platform_video_capture_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_platform_video_capture_impl.h

diff --git a/content/renderer/pepper/pepper_platform_video_capture_impl.h b/content/renderer/pepper/pepper_platform_video_capture_impl.h

index 9eb7504eefbcdef11472a4abda6cfada77bfbac7..02fe6ab0954b9a46205d0e769373c674e35bbd1e 100644

--- a/content/renderer/pepper/pepper_platform_video_capture_impl.h

+++ b/content/renderer/pepper/pepper_platform_video_capture_impl.h

@@ -13,6 +13,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/weak_ptr.h"

#include "media/video/capture/video_capture.h"

+#include "media/video/capture/video_capture_types.h"

#include "webkit/plugins/ppapi/plugin_delegate.h"

namespace media {

@@ -34,8 +35,9 @@ class PepperPlatformVideoCaptureImpl

virtual ~PepperPlatformVideoCaptureImpl();

// webkit::ppapi::PluginDelegate::PlatformVideoCapture implementation.

- virtual void StartCapture(media::VideoCapture::EventHandler* handler,

- const VideoCaptureCapability& capability) OVERRIDE;

+ virtual void StartCapture(

+ media::VideoCapture::EventHandler* handler,

+ const media::VideoCaptureCapability& capability) OVERRIDE;

virtual void StopCapture(media::VideoCapture::EventHandler* handler) OVERRIDE;

virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) OVERRIDE;

virtual bool CaptureStarted() OVERRIDE;