webrtc/modules/desktop_capture/desktop_and_cursor_composer.h - Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/

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: webrtc/modules/desktop_capture/desktop_and_cursor_composer.h

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 8 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

« no previous file with comments | « webrtc/modules/desktop_capture/cropping_window_capturer.cc ('k') | webrtc/modules/desktop_capture/desktop_and_cursor_composer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/desktop_and_cursor_composer.h

diff --git a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h

index dcbe6129e6513468eb9cf8677f0d38d3ec08ad57..bcf345e484d513142b24881c053a7a90fda4d216 100644

--- a/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h

+++ b/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h

@@ -14,6 +14,7 @@

#include <memory>

#include "webrtc/base/constructormagic.h"

+#include "webrtc/base/scoped_ptr.h"

#include "webrtc/modules/desktop_capture/desktop_capturer.h"

#include "webrtc/modules/desktop_capture/mouse_cursor_monitor.h"

@@ -36,7 +37,7 @@

// DesktopCapturer interface.

void Start(DesktopCapturer::Callback* callback) override;

void SetSharedMemoryFactory(

- std::unique_ptr<SharedMemoryFactory> shared_memory_factory) override;

+ rtc::scoped_ptr<SharedMemoryFactory> shared_memory_factory) override;

void Capture(const DesktopRegion& region) override;

void SetExcludedWindow(WindowId window) override;