content/renderer/media/pepper_to_video_track_adapter.cc - Issue 2415703002: Move files video_capture*.* from media/base to media/capture

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/media/pepper_to_video_track_adapter.cc

Issue 2415703002: Move files video_capture*.* from media/base to media/capture (Closed)

Patch Set: rebase Created 4 years, 2 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:

Index: content/renderer/media/pepper_to_video_track_adapter.cc

diff --git a/content/renderer/media/pepper_to_video_track_adapter.cc b/content/renderer/media/pepper_to_video_track_adapter.cc

index dee07944396eeae1d93a0bf195c7853a10b6e288..8535dca204bb3b8a56a675b9877887c52a6b67cd 100644

--- a/content/renderer/media/pepper_to_video_track_adapter.cc

+++ b/content/renderer/media/pepper_to_video_track_adapter.cc

@@ -18,8 +18,8 @@

#include "content/renderer/media/media_stream_video_track.h"

#include "content/renderer/pepper/ppb_image_data_impl.h"

#include "content/renderer/render_thread_impl.h"

-#include "media/base/video_capture_types.h"

#include "media/base/video_frame_pool.h"

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

#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

#include "third_party/WebKit/public/platform/WebURL.h"

#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"