Decouple c/b/cros/audio from c/b/speech.

chrome/browser/chromeos/audio/audio_handler.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_HANDLER_H_
 #define CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_HANDLER_H_
 
 #include "base/basictypes.h"
+#include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/threading/thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 
 template <typename T> struct DefaultSingletonTraits;
@@ skipping 10 matching lines @@
   class VolumeObserver {
    public:
     virtual void OnVolumeChanged() = 0;
     virtual void OnMuteToggled() = 0;
    protected:
     VolumeObserver() {}
     virtual ~VolumeObserver() {}
     DISALLOW_COPY_AND_ASSIGN(VolumeObserver);
   };
 
-  static void Initialize();
+  static void Initialize(const base::Closure& on_connected);
   static void Shutdown();
 
   // Same as Initialize but using the specified audio mixer.  It takes
   // ownership of |mixer|.
   static void InitializeForTesting(AudioMixer* mixer);
 
   // GetInstance returns NULL if not initialized or if already shutdown.
   static AudioHandler* GetInstance();
 
   // Registers volume and mute preferences.
@@ skipping 30 matching lines @@
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
   // Defines the delete on exit Singleton traits we like.  Best to have this
   // and constructor/destructor private as recommended for Singletons.
   friend struct DefaultSingletonTraits<AudioHandler>;
 
   // Takes ownership of |mixer|.
-  explicit AudioHandler(AudioMixer* mixer);
+  AudioHandler(AudioMixer* mixer, const base::Closure& on_connected);
   virtual ~AudioHandler();
 
   // Initializes the observers for the policy prefs.
   void InitializePrefObservers();
 
   // Applies the audio muting policies whenever the user logs in or policy
   // change notification is received.
   void ApplyAudioPolicy();
 
   // Sets volume to specified value and notifies observers.
   void SetVolumePercentInternal(double volume_percent);
 
   scoped_ptr<AudioMixer> mixer_;
 
   ObserverList<VolumeObserver> volume_observers_;
 
   PrefService* local_state_;  // not owned
 
   PrefChangeRegistrar pref_change_registrar_;
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_HANDLER_H_