content/browser/media/capture/web_contents_video_capture_device.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/media/capture/web_contents_video_capture_device.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/media/capture/web_contents_video_capture_device.h ('k') | content/browser/media/capture/web_contents_video_capture_device_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/capture/web_contents_video_capture_device.cc

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

similarity index 99%

rename from content/browser/renderer_host/media/web_contents_video_capture_device.cc

rename to content/browser/media/capture/web_contents_video_capture_device.cc

index 6e334650e4dedbb004949c487e38bffa82bc44dc..093703e145c051b790873ae35219ea0e7fab8114 100644

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

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

@@ -48,7 +48,7 @@

// Turning on verbose logging will cause the effective frame rate to be logged

// at 5-second intervals.

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

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

#include "base/basictypes.h"

#include "base/bind.h"

@@ -62,9 +62,9 @@

#include "base/threading/thread.h"

#include "base/threading/thread_checker.h"

#include "base/time/time.h"

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

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

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

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

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

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

#include "content/browser/renderer_host/render_widget_host_impl.h"

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

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