content/browser/media/capture/desktop_capture_device_aura.cc - Issue 1162863003: Move ContentVideoCaptureDeviceCore from src/content to src/media

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_aura.cc

Issue 1162863003: Move ContentVideoCaptureDeviceCore from src/content to src/media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 6 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/desktop_capture_device_aura.h ('k') | content/browser/media/capture/feedback_signal_accumulator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 93da72afd26ae9b4e074fa81de52b3c00b991f7a..8ecc610807ee29a6829825fa81f192e17cc00287 100644

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

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

@@ -7,7 +7,6 @@

#include "base/logging.h"

#include "base/timer/timer.h"

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

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

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

#include "ui/aura/window.h"

@@ -28,7 +27,7 @@ void SetCaptureSource(AuraWindowCaptureMachine* machine,

DesktopCaptureDeviceAura::DesktopCaptureDeviceAura(

const DesktopMediaID& source) {

AuraWindowCaptureMachine* machine = new AuraWindowCaptureMachine();

- core_.reset(new ContentVideoCaptureDeviceCore(make_scoped_ptr(machine)));

+ core_.reset(new media::ScreenCaptureDeviceCore(make_scoped_ptr(machine)));

// |core_| owns |machine| and deletes it on UI thread so passing the raw

// pointer to the UI thread is safe here.

BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,