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

Side by Side Diff: content/common/media/media_devices.h

Issue 2380793002: Migrate MediaDevices.enumerateDevices to Mojo (Closed)
Patch Set: rebase Created 4 years, 2 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 | « content/common/media/OWNERS ('k') | content/common/media/media_devices.mojom » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_COMMON_MEDIA_MEDIA_DEVICES_H_ 5 #ifndef CONTENT_COMMON_MEDIA_MEDIA_DEVICES_H_
6 #define CONTENT_COMMON_MEDIA_MEDIA_DEVICES_H_ 6 #define CONTENT_COMMON_MEDIA_MEDIA_DEVICES_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "content/common/content_export.h"
12
11 namespace content { 13 namespace content {
12 14
13 enum MediaDeviceType { 15 enum MediaDeviceType {
14 MEDIA_DEVICE_TYPE_AUDIO_INPUT, 16 MEDIA_DEVICE_TYPE_AUDIO_INPUT,
15 MEDIA_DEVICE_TYPE_VIDEO_INPUT, 17 MEDIA_DEVICE_TYPE_VIDEO_INPUT,
16 MEDIA_DEVICE_TYPE_AUDIO_OUTPUT, 18 MEDIA_DEVICE_TYPE_AUDIO_OUTPUT,
17 NUM_MEDIA_DEVICE_TYPES, 19 NUM_MEDIA_DEVICE_TYPES,
18 }; 20 };
19 21
20 struct MediaDeviceInfo { 22 struct CONTENT_EXPORT MediaDeviceInfo {
23 MediaDeviceInfo() = default;
21 MediaDeviceInfo(const std::string& device_id, 24 MediaDeviceInfo(const std::string& device_id,
22 const std::string& label, 25 const std::string& label,
23 const std::string& group_id); 26 const std::string& group_id);
24 std::string device_id; 27 std::string device_id;
25 std::string label; 28 std::string label;
26 std::string group_id; 29 std::string group_id;
27 }; 30 };
28 31
29 using MediaDeviceInfoArray = std::vector<MediaDeviceInfo>; 32 using MediaDeviceInfoArray = std::vector<MediaDeviceInfo>;
30 33
31 bool operator==(const MediaDeviceInfo& first, const MediaDeviceInfo& second); 34 bool operator==(const MediaDeviceInfo& first, const MediaDeviceInfo& second);
32 35
33 inline bool IsValidMediaDeviceType(MediaDeviceType type) { 36 inline bool IsValidMediaDeviceType(MediaDeviceType type) {
34 return type >= 0 && type < NUM_MEDIA_DEVICE_TYPES; 37 return type >= 0 && type < NUM_MEDIA_DEVICE_TYPES;
35 } 38 }
36 39
37 } // namespace content 40 } // namespace content
38 41
39 #endif // CONTENT_COMMON_MEDIA_MEDIA_DEVICES_H_ 42 #endif // CONTENT_COMMON_MEDIA_MEDIA_DEVICES_H_
OLDNEW
« no previous file with comments | « content/common/media/OWNERS ('k') | content/common/media/media_devices.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698