webrtc/modules/desktop_capture/screen_capturer_helper.h - Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/

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/screen_capturer_helper.h

Issue 1743203002: Replace scoped_ptr with unique_ptr in webrtc/modules/desktop_capture/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: More Windows reverts Created 4 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 side-by-side diff with in-line comments

Download patch

« webrtc/modules/desktop_capture/cropping_window_capturer.h ('K') | « webrtc/modules/desktop_capture/screen_capturer.h ('k') | webrtc/modules/desktop_capture/screen_capturer_helper_unittest.cc » ('j') | webrtc/modules/desktop_capture/shared_memory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/screen_capturer_helper.h

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

index da1f2bfeebd047c4c4c9019762239431b777cabc..f912378333c726517fad80a27a8e77cb03932696 100644

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

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

@@ -11,7 +11,8 @@

#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_HELPER_H_

#define WEBRTC_MODULES_DESKTOP_CAPTURE_SCREEN_CAPTURER_HELPER_H_

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

+#include <memory>

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

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

#include "webrtc/system_wrappers/include/rw_lock_wrapper.h"

@@ -70,7 +71,7 @@ class ScreenCapturerHelper {

DesktopRegion invalid_region_;

// A lock protecting |invalid_region_| across threads.

- rtc::scoped_ptr<RWLockWrapper> invalid_region_lock_;

+ std::unique_ptr<RWLockWrapper> invalid_region_lock_;

// The size of the most recently captured screen.

DesktopSize size_most_recent_;