Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

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
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);

Powered by Google App Engine
This is Rietveld 408576698