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

Unified Diff: webrtc/modules/desktop_capture/win/scoped_thread_desktop.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
Index: webrtc/modules/desktop_capture/win/scoped_thread_desktop.h
diff --git a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h b/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h
index df8652ac9d066a0e066dcb647b33926c45fce1a9..023e6df9a886aff8986ef7954196b63ef95d2f13 100644
--- a/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h
+++ b/webrtc/modules/desktop_capture/win/scoped_thread_desktop.h
@@ -11,10 +11,11 @@
#ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_
#define WEBRTC_MODULES_DESKTOP_CAPTURE_WIN_SCOPED_THREAD_DESKTOP_H_
+#include <memory>
+
#include <windows.h>
#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/scoped_ptr.h"
namespace webrtc {
@@ -40,10 +41,10 @@ class ScopedThreadDesktop {
private:
// The desktop handle assigned to the calling thread by Set
- rtc::scoped_ptr<Desktop> assigned_;
+ std::unique_ptr<Desktop> assigned_;
// The desktop handle assigned to the calling thread at creation.
- rtc::scoped_ptr<Desktop> initial_;
+ std::unique_ptr<Desktop> initial_;
RTC_DISALLOW_COPY_AND_ASSIGN(ScopedThreadDesktop);
};

Powered by Google App Engine
This is Rietveld 408576698