content/browser/media/capture/web_contents_video_capture_device.cc - Issue 2143903003: [WIP] Move media/capture to device/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/browser/media/capture/web_contents_video_capture_device.cc

Issue 2143903003: [WIP] Move media/capture to device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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/browser/media/capture/web_contents_video_capture_device.cc

diff --git a/content/browser/media/capture/web_contents_video_capture_device.cc b/content/browser/media/capture/web_contents_video_capture_device.cc

index 0733a1fd9a9b01844af1eaf338cb437c4a931c65..3a0e148ce480279b5820a710ad340476b69f0068 100644

--- a/content/browser/media/capture/web_contents_video_capture_device.cc

+++ b/content/browser/media/capture/web_contents_video_capture_device.cc

@@ -80,13 +80,13 @@

#include "content/public/browser/render_widget_host_view_frame_subscriber.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_contents_media_capture_id.h"

+#include "device/capture/content/screen_capture_device_core.h"

+#include "device/capture/content/thread_safe_capture_oracle.h"

+#include "device/capture/content/video_capture_oracle.h"

#include "media/base/bind_to_current_loop.h"

#include "media/base/video_capture_types.h"

#include "media/base/video_frame_metadata.h"

#include "media/base/video_util.h"

-#include "media/capture/content/screen_capture_device_core.h"

-#include "media/capture/content/thread_safe_capture_oracle.h"

-#include "media/capture/content/video_capture_oracle.h"

#include "skia/ext/image_operations.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "third_party/skia/include/core/SkColor.h"