| Index: media/audio/audio_output_device.h
|
| diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h
|
| index 20f4c5b2f00f1ae7e50f2489e6763b03b4e8b28f..6f04c5bc9e49067020054fa7eca514edd019121e 100644
|
| --- a/media/audio/audio_output_device.h
|
| +++ b/media/audio/audio_output_device.h
|
| @@ -109,7 +109,8 @@ class MEDIA_EXPORT AudioOutputDevice
|
| // AudioOutputIPCDelegate methods.
|
| void OnStateChanged(AudioOutputIPCDelegateState state) override;
|
| void OnDeviceAuthorized(OutputDeviceStatus device_status,
|
| - const media::AudioParameters& output_params) override;
|
| + const media::AudioParameters& output_params,
|
| + const std::string& matched_device_id) override;
|
| void OnStreamCreated(base::SharedMemoryHandle handle,
|
| base::SyncSocket::Handle socket_handle,
|
| int length) override;
|
| @@ -175,6 +176,10 @@ class MEDIA_EXPORT AudioOutputDevice
|
| const std::string device_id_;
|
| const url::Origin security_origin_;
|
|
|
| + // If |device_id_| is empty and |session_id_| is not, |matched_device_id_| is
|
| + // received in OnDeviceAuthorized().
|
| + std::string matched_device_id_;
|
| +
|
| // Our audio thread callback class. See source file for details.
|
| class AudioThreadCallback;
|
|
|
|
|