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

Unified Diff: extensions/browser/api/audio/audio_service_chromeos.cc

Issue 2585413002: Update audio api to use v2 stable device ID (Closed)
Patch Set: rebase Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/audio/audio_service_chromeos.cc
diff --git a/extensions/browser/api/audio/audio_service_chromeos.cc b/extensions/browser/api/audio/audio_service_chromeos.cc
index b3bc96530efa599346e0b6957d9fe3d5132efb56..524fefa0481fa2d9b335335d31634df99e2ef178 100644
--- a/extensions/browser/api/audio/audio_service_chromeos.cc
+++ b/extensions/browser/api/audio/audio_service_chromeos.cc
@@ -23,18 +23,6 @@ using api::audio::OutputDeviceInfo;
using api::audio::InputDeviceInfo;
using api::audio::AudioDeviceInfo;
-uint64_t GetStableDeviceId(const chromeos::AudioDevice& device) {
- // TODO(tbarzic): Update audio API to expose new stable device ID version.
- // For now, for the sake of backward compatibility, use deprecated version.
- // http://crbug.com/673392
- if (device.stable_device_id_version == 1)
- return device.stable_device_id;
- if (device.stable_device_id_version == 2)
- return device.deprecated_stable_device_id;
- NOTREACHED() << "Unsupported stable audio devide id version.";
- return 0;
-}
-
class AudioServiceImpl : public AudioService,
public chromeos::CrasAudioHandler::AudioObserver {
public:
@@ -320,7 +308,7 @@ void AudioServiceImpl::NotifyDevicesChanged() {
devices[i].id)
: cras_audio_handler_->GetInputGainPercentForDevice(devices[i].id);
info.stable_device_id.reset(
- new std::string(base::Uint64ToString(GetStableDeviceId(devices[i]))));
+ new std::string(base::Uint64ToString(devices[i].stable_device_id)));
devices_info_list.push_back(std::move(info));
}
« no previous file with comments | « extensions/browser/api/audio/audio_apitest.cc ('k') | extensions/test/data/api_test/audio/add_nodes/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698