webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.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/mac/desktop_configuration_monitor.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/differ_unittest.cc ('k') | webrtc/modules/desktop_capture/mouse_cursor.h » ('j') | webrtc/modules/desktop_capture/shared_memory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h

diff --git a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h

index b2fa81a4161dda249699ce546933f4385202f5ec..2f2dd72a6e5e4635925662aceddeff040c34d644 100644

--- a/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h

+++ b/webrtc/modules/desktop_capture/mac/desktop_configuration_monitor.h

@@ -13,9 +13,9 @@

#include <ApplicationServices/ApplicationServices.h>

+#include <memory>

#include <set>

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

#include "webrtc/modules/desktop_capture/mac/desktop_configuration.h"

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

@@ -56,7 +56,7 @@ class DesktopConfigurationMonitor {

Atomic32 ref_count_;

std::set<CGDirectDisplayID> reconfiguring_displays_;

MacDesktopConfiguration desktop_configuration_;

- rtc::scoped_ptr<EventWrapper> display_configuration_capture_event_;

+ std::unique_ptr<EventWrapper> display_configuration_capture_event_;

RTC_DISALLOW_COPY_AND_ASSIGN(DesktopConfigurationMonitor);

};