remoting/host/host_mock_objects.h - Issue 455073004: Switch DesktopEnvironment to return a DesktopCapturer.

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: remoting/host/host_mock_objects.h

Issue 455073004: Switch DesktopEnvironment to return a DesktopCapturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove ShapedDesktopCapturer::Create() Created 6 years, 4 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: remoting/host/host_mock_objects.h

diff --git a/remoting/host/host_mock_objects.h b/remoting/host/host_mock_objects.h

index 348c591dad315b76470be35227c4cd0a0da14e2e..bbddd08625666fb74529e192aceb0ed5623022ea 100644

--- a/remoting/host/host_mock_objects.h

+++ b/remoting/host/host_mock_objects.h

@@ -35,7 +35,7 @@ class MockDesktopEnvironment : public DesktopEnvironment {

MOCK_METHOD0(CreateAudioCapturerPtr, AudioCapturer*());

MOCK_METHOD0(CreateInputInjectorPtr, InputInjector*());

MOCK_METHOD0(CreateScreenControlsPtr, ScreenControls*());

- MOCK_METHOD0(CreateVideoCapturerPtr, webrtc::ScreenCapturer*());

+ MOCK_METHOD0(CreateVideoCapturerPtr, webrtc::DesktopCapturer*());

MOCK_METHOD0(CreateMouseCursorMonitorPtr, webrtc::MouseCursorMonitor*());

MOCK_CONST_METHOD0(GetCapabilities, std::string());

MOCK_METHOD1(SetCapabilities, void(const std::string&));

@@ -46,7 +46,7 @@ class MockDesktopEnvironment : public DesktopEnvironment {

virtual scoped_ptr<AudioCapturer> CreateAudioCapturer() OVERRIDE;

virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;

virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;

- virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE;

+ virtual scoped_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() OVERRIDE;

virtual scoped_ptr<GnubbyAuthHandler> CreateGnubbyAuthHandler(

protocol::ClientStub* client_stub) OVERRIDE;

virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()