Revert 251959 "Refactor the TrayAudio code so that it can be use..."

trunk/src/ash/system/tray/system_tray_notifier.h

Index: trunk/src/ash/system/tray/system_tray_notifier.h
===================================================================
--- trunk/src/ash/system/tray/system_tray_notifier.h	(revision 252005)
+++ trunk/src/ash/system/tray/system_tray_notifier.h	(working copy)
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/chromeos/tray_tracing.h"
 #include "ash/system/date/clock_observer.h"
@@ -39,16 +38,13 @@
 #endif
 
 class ASH_EXPORT SystemTrayNotifier {
- public:
+public:
   SystemTrayNotifier();
   ~SystemTrayNotifier();
 
   void AddAccessibilityObserver(AccessibilityObserver* observer);
   void RemoveAccessibilityObserver(AccessibilityObserver* observer);
 
-  void AddAudioObserver(AudioObserver* observer);
-  void RemoveAudioObserver(AudioObserver* observer);
-
   void AddBluetoothObserver(BluetoothObserver* observer);
   void RemoveBluetoothObserver(BluetoothObserver* observer);
 
@@ -98,11 +94,6 @@
 
   void NotifyAccessibilityModeChanged(
       AccessibilityNotificationVisibility notify);
-  void NotifyAudioOutputVolumeChanged();
-  void NotifyAudioOutputMuteChanged();
-  void NotifyAudioNodesChanged();
-  void NotifyAudioActiveOutputNodeChanged();
-  void NotifyAudioActiveInputNodeChanged();
   void NotifyTracingModeChanged(bool value);
   void NotifyRefreshBluetooth();
   void NotifyBluetoothDiscoveringChanged();
@@ -140,7 +131,6 @@
 
  private:
   ObserverList<AccessibilityObserver> accessibility_observers_;
-  ObserverList<AudioObserver> audio_observers_;
   ObserverList<BluetoothObserver> bluetooth_observers_;
   ObserverList<CapsLockObserver> caps_lock_observers_;
   ObserverList<ClockObserver> clock_observers_;