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

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

Issue 2563653002: Replace AudioManager::GetAudio*DeviceNames with AudioManager::GetAudio*DeviceDescriptions (Closed)
Patch Set: nit fixes Created 4 years 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/media_devices.h ('k') | media/audio/android/audio_android_unittest.cc » ('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 #include "content/common/media/media_devices.h" 5 #include "content/common/media/media_devices.h"
6 #include "media/audio/audio_device_description.h"
6 7
7 namespace content { 8 namespace content {
8 9
9 MediaDeviceInfo::MediaDeviceInfo(const std::string& device_id, 10 MediaDeviceInfo::MediaDeviceInfo(const std::string& device_id,
10 const std::string& label, 11 const std::string& label,
11 const std::string& group_id) 12 const std::string& group_id)
12 : device_id(device_id), label(label), group_id(group_id) {} 13 : device_id(device_id), label(label), group_id(group_id) {}
13 14
15 MediaDeviceInfo::MediaDeviceInfo(
16 const media::AudioDeviceDescription& device_description)
17 : device_id(device_description.unique_id),
18 label(device_description.device_name),
19 group_id(device_description.group_id) {}
20
14 bool operator==(const MediaDeviceInfo& first, const MediaDeviceInfo& second) { 21 bool operator==(const MediaDeviceInfo& first, const MediaDeviceInfo& second) {
15 return first.device_id == second.device_id && first.label == second.label; 22 return first.device_id == second.device_id && first.label == second.label;
16 } 23 }
17 24
18 } // namespace content 25 } // namespace content
OLDNEW
« no previous file with comments | « content/common/media/media_devices.h ('k') | media/audio/android/audio_android_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698