| Index: chrome/browser/chromeos/audio/audio_mixer_alsa.h
|
| diff --git a/chrome/browser/chromeos/audio/audio_mixer_alsa.h b/chrome/browser/chromeos/audio/audio_mixer_alsa.h
|
| index c954d2ef3b258ac96ac00c0dd9207c54bffb59da..204b6d1ed132821e88335436bc476ff1bd4eb4ac 100644
|
| --- a/chrome/browser/chromeos/audio/audio_mixer_alsa.h
|
| +++ b/chrome/browser/chromeos/audio/audio_mixer_alsa.h
|
| @@ -28,7 +28,7 @@ class AudioMixerAlsa : public AudioMixer {
|
| virtual ~AudioMixerAlsa();
|
|
|
| // AudioMixer implementation.
|
| - virtual void Init() OVERRIDE;
|
| + virtual void Init(const base::Closure& on_connected) OVERRIDE;
|
| virtual double GetVolumePercent() OVERRIDE;
|
| virtual void SetVolumePercent(double percent) OVERRIDE;
|
| virtual bool IsMuted() OVERRIDE;
|
| @@ -43,12 +43,12 @@ class AudioMixerAlsa : public AudioMixer {
|
| private:
|
| // Tries to connect to ALSA. On failure, posts a delayed Connect() task to
|
| // try again.
|
| - void Connect();
|
| + void Connect(const base::Closure& on_connected);
|
|
|
| // Helper method called by Connect(). On success, initializes
|
| // |min_volume_db_|, |max_volume_db_|, |alsa_mixer_|, and |element_*| and
|
| // returns true.
|
| - bool ConnectInternal();
|
| + bool ConnectInternal(const base::Closure& on_connected);
|
|
|
| // Disconnects from ALSA if currently connected and signals
|
| // |disconnected_event_|.
|
|
|