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

Unified Diff: webrtc/media/devices/devicemanager.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/carbonvideorenderer.h ('k') | webrtc/media/devices/devicemanager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/devices/devicemanager.h
diff --git a/webrtc/media/devices/devicemanager.h b/webrtc/media/devices/devicemanager.h
index 2aba791d70af35995f1fe5aa5681cfcad1624196..01f4cb3c9c57422d4c878465d109404b3e1923fe 100644
--- a/webrtc/media/devices/devicemanager.h
+++ b/webrtc/media/devices/devicemanager.h
@@ -12,10 +12,10 @@
#define WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
#include <map>
+#include <memory>
#include <string>
#include <vector>
-#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/base/stringencode.h"
#include "webrtc/base/window.h"
@@ -178,13 +178,13 @@ class DeviceManager : public DeviceManagerInterface {
const char* const exclusion_list[]);
bool initialized_;
- rtc::scoped_ptr<
+ std::unique_ptr<
VideoDeviceCapturerFactory> video_device_capturer_factory_;
- rtc::scoped_ptr<
+ std::unique_ptr<
ScreenCapturerFactory> screen_capturer_factory_;
std::map<std::string, VideoFormat> max_formats_;
- rtc::scoped_ptr<DeviceWatcher> watcher_;
- rtc::scoped_ptr<rtc::WindowPicker> window_picker_;
+ std::unique_ptr<DeviceWatcher> watcher_;
+ std::unique_ptr<rtc::WindowPicker> window_picker_;
};
} // namespace cricket
« no previous file with comments | « webrtc/media/devices/carbonvideorenderer.h ('k') | webrtc/media/devices/devicemanager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698