media/video/capture/screen/screen_capture_device.h - Issue 15692018: Remove screen capturers from media/video/capture/screen.

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: media/video/capture/screen/screen_capture_device.h

Issue 15692018: Remove screen capturers from media/video/capture/screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: media/video/capture/screen/screen_capture_device.h

diff --git a/media/video/capture/screen/screen_capture_device.h b/media/video/capture/screen/screen_capture_device.h

index f1cee9838044724acb8979298c8788644152f302..94e4d9c2d8cf0bc010305c471a0155f7cf42090d 100644

--- a/media/video/capture/screen/screen_capture_device.h

+++ b/media/video/capture/screen/screen_capture_device.h

@@ -8,9 +8,9 @@

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

#include "media/base/media_export.h"

-#include "media/video/capture/screen/screen_capturer.h"

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

#include "third_party/skia/include/core/SkBitmap.h"

+#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"

namespace base {

class SequencedTaskRunner;

@@ -28,7 +28,7 @@ class MEDIA_EXPORT ScreenCaptureDevice : public VideoCaptureDevice {

// Helper used in tests to supply a fake capturer.

void SetScreenCapturerForTest(

- scoped_ptr<media::ScreenCapturer> capturer);

+ scoped_ptr<webrtc::ScreenCapturer> capturer);

// VideoCaptureDevice interface.

virtual void Allocate(int width, int height,