Switch Audio Preferences to per device.

chromeos/audio/cras_audio_handler.h

 // Copyright (c) 2013 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 CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_
 #define CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chromeos/audio/audio_device.h"
 #include "chromeos/audio/audio_pref_observer.h"
 #include "chromeos/dbus/audio_node.h"
 #include "chromeos/dbus/cras_audio_client.h"
 #include "chromeos/dbus/volume_state.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace chromeos {
 
-class AudioPrefHandler;
+class AudioDevicesPrefHandler;
 
 class CHROMEOS_EXPORT CrasAudioHandler : public CrasAudioClient::Observer,
                                          public AudioPrefObserver {
  public:
   class AudioObserver {
    public:
     // Called when output volume changed.
     virtual void OnOutputVolumeChanged();
 
     // Called when output mute state changed.
@@ skipping 11 matching lines @@
     // Called when active audio input node changed.
     virtual void OnActiveInputNodeChanged();
 
    protected:
     AudioObserver();
     virtual ~AudioObserver();
     DISALLOW_COPY_AND_ASSIGN(AudioObserver);
   };
 
   // Sets the global instance. Must be called before any calls to Get().
-  static void Initialize(scoped_refptr<AudioPrefHandler> audio_pref_handler);
+  static void Initialize(
+      scoped_refptr<AudioDevicesPrefHandler>audio_pref_handler);

[Pam (message me for reviews), 2013/05/02 15:11:40]

Please restore the space after the >

[rkc, 2013/05/02 18:46:09]

Done.

 
   // Sets the global instance for testing.
   static void InitializeForTesting();
 
   // Destroys the global instance.
   static void Shutdown();
 
   // Returns true if the global instance is initialized.
   static bool IsInitialized();
 
@@ skipping 44 matching lines @@
   // Mutes or unmutes audio input device.
   virtual void SetInputMute(bool mute_on);
 
   // Sets the active audio output node to the node with |node_id|.
   virtual void SetActiveOutputNode(uint64 node_id);
 
   // Sets the active audio input node to the node with |node_id|.
   virtual void SetActiveInputNode(uint64 node_id);
 
  protected:
-  explicit CrasAudioHandler(scoped_refptr<AudioPrefHandler> audio_pref_handler);
+  explicit CrasAudioHandler(
+      scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler);
   virtual ~CrasAudioHandler();
 
  private:
   // Overriden from CrasAudioHandler::Observer.
   virtual void AudioClientRestarted() OVERRIDE;
   virtual void OutputVolumeChanged(int volume) OVERRIDE;
   virtual void OutputMuteChanged(bool mute_on) OVERRIDE;
   virtual void InputMuteChanged(bool mute_on) OVERRIDE;
   virtual void NodesChanged() OVERRIDE;
   virtual void ActiveOutputNodeChanged(uint64 node_id) OVERRIDE;
   virtual void ActiveInputNodeChanged(uint64 node_id) OVERRIDE;
 
   // Overriden from AudioPrefObserver.
   virtual void OnAudioPolicyPrefChanged() OVERRIDE;
 
-  // Sets up the initial audio device state based on audio policy and
-  // audio settings saved in prefs.
-  void SetupInitialAudioState();
+  // Sets up the audio device state based on audio policy and audio settings
+  // saved in prefs.
+  void SetupAudioState();
 
   // Applies the audio muting policies whenever the user logs in or policy
   // change notification is received.
   void ApplyAudioPolicy();
 
   // Sets output volume to specified value and notifies observers.
   void SetOutputVolumeInternal(int volume);
 
   // Calling dbus to get nodes data.
   void GetNodes();
 
   // Handles dbus callback for GetNodes.
   void HandleGetNodes(const chromeos::AudioNodeList& node_list, bool success);
 
-  scoped_refptr<AudioPrefHandler> audio_pref_handler_;
+  scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler_;
   base::WeakPtrFactory<CrasAudioHandler> weak_ptr_factory_;
   ObserverList<AudioObserver> observers_;
 
   // Audio data and state.
   AudioDeviceList audio_devices_;
   VolumeState volume_state_;
   bool output_mute_on_;
   bool input_mute_on_;
   int output_volume_;
   uint64 active_output_node_id_;
   uint64 active_input_node_id_;
   bool has_alternative_input_;
   bool has_alternative_output_;
 
   bool output_mute_locked_;
   bool input_mute_locked_;
 
   DISALLOW_COPY_AND_ASSIGN(CrasAudioHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_