Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1770)

Unified Diff: webrtc/modules/desktop_capture/shared_desktop_frame.cc

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
Index: webrtc/modules/desktop_capture/shared_desktop_frame.cc
diff --git a/webrtc/modules/desktop_capture/shared_desktop_frame.cc b/webrtc/modules/desktop_capture/shared_desktop_frame.cc
index 1f1aefa13bdfbbaa31cfb2622557c2838e2b65ef..309bac55add20cb268344508433b8f081016bd3b 100644
--- a/webrtc/modules/desktop_capture/shared_desktop_frame.cc
+++ b/webrtc/modules/desktop_capture/shared_desktop_frame.cc
@@ -10,7 +10,8 @@
#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"
-#include "webrtc/base/scoped_ptr.h"
+#include <memory>
+
#include "webrtc/system_wrappers/include/atomic32.h"
namespace webrtc {
@@ -39,7 +40,7 @@ class SharedDesktopFrame::Core {
virtual ~Core() {}
Atomic32 ref_count_;
- rtc::scoped_ptr<DesktopFrame> frame_;
+ std::unique_ptr<DesktopFrame> frame_;
RTC_DISALLOW_COPY_AND_ASSIGN(Core);
};

Powered by Google App Engine
This is Rietveld 408576698