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

Unified Diff: webrtc/media/devices/gdivideorenderer.h

Issue 1728503002: Replace scoped_ptr with unique_ptr in webrtc/media/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up1
Patch Set: Created 4 years, 10 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/media/devices/fakedevicemanager.h ('k') | webrtc/media/devices/gdivideorenderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/devices/gdivideorenderer.h
diff --git a/webrtc/media/devices/gdivideorenderer.h b/webrtc/media/devices/gdivideorenderer.h
index 12228122a96e950f97026c959aded169feda030d..140e52330554d4a9d2ece85cd0a2d3defba30422 100644
--- a/webrtc/media/devices/gdivideorenderer.h
+++ b/webrtc/media/devices/gdivideorenderer.h
@@ -14,9 +14,10 @@
#ifndef WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_
#define WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_
-
#ifdef WIN32
-#include "webrtc/base/scoped_ptr.h"
+
+#include <memory>
+
#include "webrtc/media/base/videorenderer.h"
namespace cricket {
@@ -34,7 +35,7 @@ class GdiVideoRenderer : public VideoRenderer {
private:
class VideoWindow; // forward declaration, defined in the .cc file
- rtc::scoped_ptr<VideoWindow> window_;
+ std::unique_ptr<VideoWindow> window_;
// The initial position of the window.
int initial_x_;
int initial_y_;
« no previous file with comments | « webrtc/media/devices/fakedevicemanager.h ('k') | webrtc/media/devices/gdivideorenderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698