content/browser/media/capture/desktop_capture_device_aura.h - Issue 974513002: content: Split out VideoCaptureMachine from DesktopCaptureDeviceAura

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 974513002: content: Split out VideoCaptureMachine from DesktopCaptureDeviceAura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove unnecessary use of WeakPtr & rebase on ToT Created 5 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

« content/browser/media/capture/aura_window_capture_machine.cc ('K') | « content/browser/media/capture/aura_window_capture_machine.cc ('k') | content/browser/media/capture/desktop_capture_device_aura.cc » ('j') | content/browser/media/capture/desktop_capture_device_aura.cc » ('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 8f3540a7fd6f4b2887525917273ae2531877668a..7eb80c048f5f2c05795df00a509f074a4d3a3f1e 100644

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

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

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

namespace content {

class ContentVideoCaptureDeviceCore;

+class AuraWindowCaptureMachine;

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

class CONTENT_EXPORT DesktopCaptureDeviceAura

@@ -35,8 +36,10 @@ class CONTENT_EXPORT DesktopCaptureDeviceAura

void StopAndDeAllocate() override;

private:

- DesktopCaptureDeviceAura(const DesktopMediaID& source);

+ DesktopCaptureDeviceAura();

+ // machine_ is owned by core_.

+ AuraWindowCaptureMachine* machine_;

Sergey Ulanov 2015/03/04 18:48:59 I don't think you need this.

robert.bradford 2015/03/04 21:05:10 Done.

const scoped_ptr<class ContentVideoCaptureDeviceCore> core_;

DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAura);