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

Side by Side Diff: webrtc/media/devices/fakedevicemanager.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
« no previous file with comments | « webrtc/media/devices/devicemanager_unittest.cc ('k') | webrtc/media/devices/gdivideorenderer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2008 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2008 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_FAKEDEVICEMANAGER_H_ 11 #ifndef WEBRTC_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_
12 #define WEBRTC_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_ 12 #define WEBRTC_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_
13 13
14 #include <memory>
14 #include <string> 15 #include <string>
15 #include <vector> 16 #include <vector>
16 17
17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/base/window.h" 18 #include "webrtc/base/window.h"
19 #include "webrtc/base/windowpicker.h" 19 #include "webrtc/base/windowpicker.h"
20 #include "webrtc/media/base/fakevideocapturer.h" 20 #include "webrtc/media/base/fakevideocapturer.h"
21 #include "webrtc/media/base/mediacommon.h" 21 #include "webrtc/media/base/mediacommon.h"
22 #include "webrtc/media/devices/devicemanager.h" 22 #include "webrtc/media/devices/devicemanager.h"
23 23
24 namespace cricket { 24 namespace cricket {
25 25
26 class FakeDeviceManager : public DeviceManagerInterface { 26 class FakeDeviceManager : public DeviceManagerInterface {
27 public: 27 public:
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 } 206 }
207 } 207 }
208 return false; 208 return false;
209 } 209 }
210 210
211 private: 211 private:
212 std::vector<Device> input_devices_; 212 std::vector<Device> input_devices_;
213 std::vector<Device> output_devices_; 213 std::vector<Device> output_devices_;
214 std::vector<Device> vidcap_devices_; 214 std::vector<Device> vidcap_devices_;
215 std::map<std::string, VideoFormat> max_formats_; 215 std::map<std::string, VideoFormat> max_formats_;
216 rtc::scoped_ptr< 216 std::unique_ptr<
217 ScreenCapturerFactory> screen_capturer_factory_; 217 ScreenCapturerFactory> screen_capturer_factory_;
218 }; 218 };
219 219
220 } // namespace cricket 220 } // namespace cricket
221 221
222 #endif // WEBRTC_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_ 222 #endif // WEBRTC_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_
OLDNEW
« no previous file with comments | « webrtc/media/devices/devicemanager_unittest.cc ('k') | webrtc/media/devices/gdivideorenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698