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

Unified Diff: chrome/browser/chromeos/audio/audio_mixer_cras.h

Issue 11358083: Decouple c/b/cros/audio from c/b/speech. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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: chrome/browser/chromeos/audio/audio_mixer_cras.h
diff --git a/chrome/browser/chromeos/audio/audio_mixer_cras.h b/chrome/browser/chromeos/audio/audio_mixer_cras.h
index 5650fb0cfd6ccc7a7135f4ae03329e5a6a95a43e..b91a5b8d72af9aa69d9e9fb9b07314dca20f4bc8 100644
--- a/chrome/browser/chromeos/audio/audio_mixer_cras.h
+++ b/chrome/browser/chromeos/audio/audio_mixer_cras.h
@@ -25,7 +25,7 @@ class AudioMixerCras : public AudioMixer {
virtual ~AudioMixerCras();
// 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;
@@ -40,7 +40,7 @@ class AudioMixerCras : public AudioMixer {
private:
// Tries to connect to CRAS. On failure, posts a delayed Connect() task to
// try again. Failure could occur if the CRAS server isn't running yet.
- void Connect();
+ void Connect(const base::Closure& on_connected);
// Updates |client_| for current values of |volume_percent_| and
// |is_muted_|. No-op if not connected.
« no previous file with comments | « chrome/browser/chromeos/audio/audio_mixer_alsa.cc ('k') | chrome/browser/chromeos/audio/audio_mixer_cras.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698