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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/media/media_devices.cc
diff --git a/content/common/media/media_devices.cc b/content/common/media/media_devices.cc
index c4bb498a656a1438c2f2df866b22c33cda44213c..a18349b88136609038468d56e3c2b8fe064b35e5 100644
--- a/content/common/media/media_devices.cc
+++ b/content/common/media/media_devices.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "content/common/media/media_devices.h"
+#include "media/audio/audio_device_description.h"
namespace content {
@@ -11,6 +12,12 @@ MediaDeviceInfo::MediaDeviceInfo(const std::string& device_id,
const std::string& group_id)
: device_id(device_id), label(label), group_id(group_id) {}
+MediaDeviceInfo::MediaDeviceInfo(
+ const media::AudioDeviceDescription& device_description)
+ : device_id(device_description.unique_id),
+ label(device_description.device_name),
+ group_id(device_description.group_id) {}
+
bool operator==(const MediaDeviceInfo& first, const MediaDeviceInfo& second) {
return first.device_id == second.device_id && first.label == second.label;
}
« 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