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

Unified Diff: webrtc/media/devices/carbonvideorenderer.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/base/videoframefactory.cc ('k') | webrtc/media/devices/devicemanager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/devices/carbonvideorenderer.h
diff --git a/webrtc/media/devices/carbonvideorenderer.h b/webrtc/media/devices/carbonvideorenderer.h
index 71e88aeb7f94c884d1f8bdf619c4e17043e0c498..0f801c2297c7a78d96a6e1eba420d52690cca765 100644
--- a/webrtc/media/devices/carbonvideorenderer.h
+++ b/webrtc/media/devices/carbonvideorenderer.h
@@ -14,10 +14,11 @@
#ifndef WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
#define WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
+#include <memory>
+
#include <Carbon/Carbon.h>
#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/media/base/videorenderer.h"
namespace cricket {
@@ -42,7 +43,7 @@ class CarbonVideoRenderer : public VideoRenderer {
static OSStatus DrawEventHandler(EventHandlerCallRef handler,
EventRef event,
void* data);
- rtc::scoped_ptr<uint8_t[]> image_;
+ std::unique_ptr<uint8_t[]> image_;
rtc::CriticalSection image_crit_;
int image_width_;
int image_height_;
« no previous file with comments | « webrtc/media/base/videoframefactory.cc ('k') | webrtc/media/devices/devicemanager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698