Chromium Code Reviews| Index: chrome/browser/chromeos/audio/audio_handler.h |
| diff --git a/chrome/browser/chromeos/audio/audio_handler.h b/chrome/browser/chromeos/audio/audio_handler.h |
| index 27027f4d949d3a6ad8f00f3062eeaf1ccd4cc75f..16d51751e59e404f04109731f6fd2c4f7d1ee2e4 100644 |
| --- a/chrome/browser/chromeos/audio/audio_handler.h |
| +++ b/chrome/browser/chromeos/audio/audio_handler.h |
| @@ -33,6 +33,9 @@ class AudioHandler { |
| static void Initialize(); |
| static void Shutdown(); |
| + // Same as Initialize but using the specified audio mixer. |
| + static void InitializeForTesting(AudioMixer* mixer); |
|
Daniel Erat
2012/05/18 23:45:13
nit: mention that this takes ownership of |mixer|
Jun Mukai
2012/05/18 23:53:19
Done.
|
| + |
| // GetInstance returns NULL if not initialized or if already shutdown. |
| static AudioHandler* GetInstance(); |
| @@ -62,7 +65,7 @@ class AudioHandler { |
| // and constructor/destructor private as recommended for Singletons. |
| friend struct DefaultSingletonTraits<AudioHandler>; |
| - AudioHandler(); |
| + explicit AudioHandler(AudioMixer* mixer); |
|
Daniel Erat
2012/05/18 23:45:13
nit: mention that this takes ownership of |mixer|
Jun Mukai
2012/05/18 23:53:19
Done.
|
| virtual ~AudioHandler(); |
| scoped_ptr<AudioMixer> mixer_; |