content/browser/renderer_host/media/video_capture_manager.cc - Issue 172003004: Fixit: Move tab and desktop capture code to new location.

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

Issue 172003004: Fixit: Move tab and desktop capture code to new location. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 10 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/renderer_host/media/video_capture_manager.cc

diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc

index a5470371c0344e6d6873f16f348c056cd0f93c86..54ad96e7714943e089c852fa174e0d677e6ae541 100644

--- a/content/browser/renderer_host/media/video_capture_manager.cc

+++ b/content/browser/renderer_host/media/video_capture_manager.cc

@@ -13,9 +13,9 @@

#include "base/stl_util.h"

#include "base/task_runner_util.h"

#include "base/threading/sequenced_worker_pool.h"

+#include "content/browser/media/capture/web_contents_video_capture_device.h"

#include "content/browser/renderer_host/media/video_capture_controller.h"

#include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"

-#include "content/browser/renderer_host/media/web_contents_video_capture_device.h"

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

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

#include "content/public/common/content_switches.h"

@@ -27,9 +27,9 @@

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

#if defined(ENABLE_SCREEN_CAPTURE)

-#include "content/browser/renderer_host/media/desktop_capture_device.h"

+#include "content/browser/media/capture/desktop_capture_device.h"

#if defined(USE_AURA)

-#include "content/browser/renderer_host/media/desktop_capture_device_aura.h"

+#include "content/browser/media/capture/desktop_capture_device_aura.h"

#endif