Index: chromeos/audio/audio_devices_pref_handler_stub.cc |
diff --git a/chromeos/audio/audio_devices_pref_handler_stub.cc b/chromeos/audio/audio_devices_pref_handler_stub.cc |
index 6c59877400083d3e808416d11ab286e4b352b819..21c2fe1d4a268a922de4875c563954e489647131 100644 |
--- a/chromeos/audio/audio_devices_pref_handler_stub.cc |
+++ b/chromeos/audio/audio_devices_pref_handler_stub.cc |
@@ -17,32 +17,47 @@ AudioDevicesPrefHandlerStub::~AudioDevicesPrefHandlerStub() { |
double AudioDevicesPrefHandlerStub::GetOutputVolumeValue( |
const AudioDevice* device) { |
- if (!device || !ContainsKey(audio_device_volume_gain_map_, device->id)) |
+ if (!device || |
+ !ContainsKey(audio_device_volume_gain_map_, device->stable_device_id)) |
return kDefaultOutputVolumePercent; |
- return audio_device_volume_gain_map_[device->id]; |
+ return audio_device_volume_gain_map_[device->stable_device_id]; |
} |
double AudioDevicesPrefHandlerStub::GetInputGainValue( |
const AudioDevice* device) { |
// TODO(rkc): The default value for gain is wrong. http://crbug.com/442489 |
- if (!device || !ContainsKey(audio_device_volume_gain_map_, device->id)) |
+ if (!device || |
+ !ContainsKey(audio_device_volume_gain_map_, device->stable_device_id)) |
return 75.0; |
- return audio_device_volume_gain_map_[device->id]; |
+ return audio_device_volume_gain_map_[device->stable_device_id]; |
} |
void AudioDevicesPrefHandlerStub::SetVolumeGainValue(const AudioDevice& device, |
double value) { |
- audio_device_volume_gain_map_[device.id] = value; |
+ audio_device_volume_gain_map_[device.stable_device_id] = value; |
} |
bool AudioDevicesPrefHandlerStub::GetMuteValue( |
const AudioDevice& device) { |
- return audio_device_mute_map_[device.id]; |
+ return audio_device_mute_map_[device.stable_device_id]; |
} |
void AudioDevicesPrefHandlerStub::SetMuteValue(const AudioDevice& device, |
bool mute_on) { |
- audio_device_mute_map_[device.id] = mute_on; |
+ audio_device_mute_map_[device.stable_device_id] = mute_on; |
+} |
+ |
+AudioDeviceState AudioDevicesPrefHandlerStub::GetDeviceState( |
+ const AudioDevice& device) { |
+ if (audio_device_state_map_.find(device.stable_device_id) == |
+ audio_device_state_map_.end()) |
+ return AUDIO_STATE_NOT_AVAILABLE; |
+ return audio_device_state_map_[device.stable_device_id]; |
+} |
+ |
+void AudioDevicesPrefHandlerStub::SetDeviceState(const AudioDevice& device, |
+ AudioDeviceState state) { |
+ audio_device_state_map_[device.stable_device_id] = state; |
} |
bool AudioDevicesPrefHandlerStub::GetAudioOutputAllowedValue() { |