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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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: Fix non-aura mac build Created 5 years, 9 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 unified diff | Download patch

« no previous file with comments | « content/browser/media/capture/aura_window_capture_machine.cc ('k') | content/browser/media/capture/desktop_capture_device_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_	5 #ifndef CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_

6 #define CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_	6 #define CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 19 matching lines...) Expand all Loading...
30 ~DesktopCaptureDeviceAura() override;	30 ~DesktopCaptureDeviceAura() override;

31	31

32 // VideoCaptureDevice implementation.	32 // VideoCaptureDevice implementation.

33 void AllocateAndStart(const media::VideoCaptureParams& params,	33 void AllocateAndStart(const media::VideoCaptureParams& params,

34 scoped_ptr<Client> client) override;	34 scoped_ptr<Client> client) override;

35 void StopAndDeAllocate() override;	35 void StopAndDeAllocate() override;

36	36

37 private:	37 private:

38 DesktopCaptureDeviceAura(const DesktopMediaID& source);	38 DesktopCaptureDeviceAura(const DesktopMediaID& source);

39	39

40 const scoped_ptr<class ContentVideoCaptureDeviceCore> core_;	40 scoped_ptr<class ContentVideoCaptureDeviceCore> core_;

41	41

42 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAura);	42 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAura);

43 };	43 };

44	44

45	45

46 } // namespace content	46 } // namespace content

47	47

48 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_	48 #endif // CONTENT_BROWSER_MEDIA_CAPTURE_DESKTOP_CAPTURE_DEVICE_AURA_H_

OLD	NEW