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

Side by Side 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_ 11 #ifndef WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
12 #define WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_ 12 #define WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
13 13
14 #include <map> 14 #include <map>
15 #include <memory>
15 #include <string> 16 #include <string>
16 #include <vector> 17 #include <vector>
17 18
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/base/sigslot.h" 19 #include "webrtc/base/sigslot.h"
20 #include "webrtc/base/stringencode.h" 20 #include "webrtc/base/stringencode.h"
21 #include "webrtc/base/window.h" 21 #include "webrtc/base/window.h"
22 #include "webrtc/media/base/device.h" 22 #include "webrtc/media/base/device.h"
23 #include "webrtc/media/base/screencastid.h" 23 #include "webrtc/media/base/screencastid.h"
24 #include "webrtc/media/base/videocapturerfactory.h" 24 #include "webrtc/media/base/videocapturerfactory.h"
25 #include "webrtc/media/base/videocommon.h" 25 #include "webrtc/media/base/videocommon.h"
26 26
27 namespace rtc { 27 namespace rtc {
28 28
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 171
172 void set_watcher(DeviceWatcher* watcher) { watcher_.reset(watcher); } 172 void set_watcher(DeviceWatcher* watcher) { watcher_.reset(watcher); }
173 DeviceWatcher* watcher() { return watcher_.get(); } 173 DeviceWatcher* watcher() { return watcher_.get(); }
174 174
175 private: 175 private:
176 // The exclusion_list MUST be a NULL terminated list. 176 // The exclusion_list MUST be a NULL terminated list.
177 static bool ShouldDeviceBeIgnored(const std::string& device_name, 177 static bool ShouldDeviceBeIgnored(const std::string& device_name,
178 const char* const exclusion_list[]); 178 const char* const exclusion_list[]);
179 179
180 bool initialized_; 180 bool initialized_;
181 rtc::scoped_ptr< 181 std::unique_ptr<
182 VideoDeviceCapturerFactory> video_device_capturer_factory_; 182 VideoDeviceCapturerFactory> video_device_capturer_factory_;
183 rtc::scoped_ptr< 183 std::unique_ptr<
184 ScreenCapturerFactory> screen_capturer_factory_; 184 ScreenCapturerFactory> screen_capturer_factory_;
185 std::map<std::string, VideoFormat> max_formats_; 185 std::map<std::string, VideoFormat> max_formats_;
186 rtc::scoped_ptr<DeviceWatcher> watcher_; 186 std::unique_ptr<DeviceWatcher> watcher_;
187 rtc::scoped_ptr<rtc::WindowPicker> window_picker_; 187 std::unique_ptr<rtc::WindowPicker> window_picker_;
188 }; 188 };
189 189
190 } // namespace cricket 190 } // namespace cricket
191 191
192 #endif // WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_ 192 #endif // WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
OLDNEW
« 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