webrtc/modules/desktop_capture/desktop_capturer.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_capturer.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/desktop_and_cursor_composer.cc ('k') | webrtc/modules/desktop_capture/screen_capturer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/desktop_capturer.h

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

index ba70e0155373410475cff8b27a8362bae453b265..9c2b8c308a92d65b135f20cd1a925e687dec904a 100644

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

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

@@ -13,8 +13,7 @@

#include <stddef.h>

-#include <memory>

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

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

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

@@ -49,7 +48,7 @@

// where Capture() is called. It will be destroyed on the same thread. Shared

// memory is currently supported only by some DesktopCapturer implementations.

virtual void SetSharedMemoryFactory(

- std::unique_ptr<SharedMemoryFactory> shared_memory_factory) {}

+ rtc::scoped_ptr<SharedMemoryFactory> shared_memory_factory) {}

// Captures next frame. |region| specifies region of the capture target that

// should be fresh in the resulting frame. The frame may also include fresh