content/browser/media/capture/desktop_capture_device_aura.h - 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.h

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

Patch Set: Created 5 years, 7 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

« content/browser/media/capture/aura_window_capture_machine.h ('K') | « content/browser/media/capture/desktop_capture_device.cc ('k') | content/browser/media/capture/desktop_capture_device_aura.cc » ('j') | content/content_browser.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 404c730128f363f54adcfae56a9398ea7e502682..6e487bc956d9cef188a6f10396fd9fb89e32b27d 100644

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

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

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

#include "base/memory/scoped_ptr.h"

#include "content/common/content_export.h"

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

+#include "media/capture/media_video_capture_device_core.h"

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

namespace aura {

@@ -18,7 +19,7 @@ class Window;

namespace content {

-class ContentVideoCaptureDeviceCore;

+class MediaVideoCaptureDeviceCore;

// An implementation of VideoCaptureDevice that mirrors an Aura window.

class CONTENT_EXPORT DesktopCaptureDeviceAura

@@ -37,7 +38,7 @@ class CONTENT_EXPORT DesktopCaptureDeviceAura

private:

DesktopCaptureDeviceAura(const DesktopMediaID& source);

- scoped_ptr<class ContentVideoCaptureDeviceCore> core_;

+ scoped_ptr<media::MediaVideoCaptureDeviceCore> core_;

DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAura);

};