content/browser/media/capture/desktop_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/desktop_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/desktop_capture_device.cc

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

index efd4e318ce3367cbdfabddce3079cd7882ea7ade..79989149e0699bee924aa30f03e88d4021fa9a3e 100644

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

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

@@ -22,9 +22,9 @@

#include "content/browser/media/capture/desktop_capture_device_uma_types.h"

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

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

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

#include "device/power_save_blocker/power_save_blocker.h"

#include "media/base/video_util.h"

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

#include "third_party/libyuv/include/libyuv/scale_argb.h"

#include "third_party/webrtc/modules/desktop_capture/cropping_window_capturer.h"

#include "third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h"