Reduce chrome cras dbus call logs during device rebooting.

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 <queue>
 
 #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/session_manager_client.h"
 #include "chromeos/dbus/volume_state.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace chromeos {
 
 class AudioDevicesPrefHandler;
 
 class CHROMEOS_EXPORT CrasAudioHandler : public CrasAudioClient::Observer,
-                                         public AudioPrefObserver {
+                                         public AudioPrefObserver,
+                                         public SessionManagerClient::Observer {
  public:
   typedef std::priority_queue<AudioDevice,
                               std::vector<AudioDevice>,
                               AudioDeviceCompare> AudioDevicePriorityQueue;
 
   class AudioObserver {
    public:
     // Called when output volume changed.
     virtual void OnOutputVolumeChanged();
 
@@ skipping 113 matching lines @@
 
   // Sets the mute for device.
   virtual void SetMuteForDevice(uint64 device_id, bool mute_on);
 
  protected:
   explicit CrasAudioHandler(
       scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler);
   virtual ~CrasAudioHandler();
 
  private:
-  // Overriden from CrasAudioClient::Observer.
+  // CrasAudioClient::Observer overrides.
   virtual void AudioClientRestarted() OVERRIDE;
   virtual void NodesChanged() OVERRIDE;
   virtual void ActiveOutputNodeChanged(uint64 node_id) OVERRIDE;
   virtual void ActiveInputNodeChanged(uint64 node_id) OVERRIDE;
 
-  // Overriden from AudioPrefObserver.
+  // AudioPrefObserver overrides.
   virtual void OnAudioPolicyPrefChanged() OVERRIDE;
 
+  // SessionManagerClient::Observer overrides.
+  virtual void EmitLoginPromptVisibleCalled() OVERRIDE;
+
   // Sets the active audio output/input node to the node with |node_id|.
   void SetActiveOutputNode(uint64 node_id);
   void SetActiveInputNode(uint64 node_id);
 
   // Sets up the audio device state based on audio policy and audio settings
   // saved in prefs.
   void SetupAudioInputState();
   void SetupAudioOutputState();
 
   const AudioDevice* GetDeviceFromId(uint64 device_id) const;
@@ skipping 38 matching lines @@
                                 size_t new_device_size,
                                 uint64 current_active_node);
 
   // Returns true if there is any device change for for input or output,
   // specified by |is_input|.
   bool HasDeviceChange(const AudioNodeList& new_nodes, bool is_input);
 
   // Handles dbus callback for GetNodes.
   void HandleGetNodes(const chromeos::AudioNodeList& node_list, bool success);
 
+  // Handles the dbus error callback.
+  void HandleGetNodesError(const std::string& error_name,
+                           const std::string& error_msg);
+
   scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler_;
   base::WeakPtrFactory<CrasAudioHandler> weak_ptr_factory_;
   ObserverList<AudioObserver> observers_;
 
   // Audio data and state.
   AudioDeviceMap audio_devices_;
 
   AudioDevicePriorityQueue input_devices_pq_;
   AudioDevicePriorityQueue output_devices_pq_;
 
   bool output_mute_on_;
   bool input_mute_on_;
   int output_volume_;
   int input_gain_;
   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_;
 
+  bool enable_log_;

[Daniel Erat, 2013/09/12 21:10:05]

nit: add a brief comment like:

// Failures are not logged at startup, since CRAS may not be running yet.

[jennyz, 2013/09/12 22:34:45]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(CrasAudioHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_