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

trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Index: trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
===================================================================
--- trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h	(revision 252005)
+++ trunk/src/chrome/browser/ui/ash/system_tray_delegate_chromeos.h	(working copy)
@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
-#include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/login/login_state.h"
@@ -39,7 +38,6 @@
       public content::NotificationObserver,
       public input_method::InputMethodManager::Observer,
       public chromeos::LoginState::Observer,
-      public chromeos::CrasAudioHandler::AudioObserver,
       public device::BluetoothAdapter::Observer,
       public SystemKeyEventListener::CapsLockObserver,
       public policy::CloudPolicyStore::Observer,
@@ -188,15 +186,6 @@
   virtual void InputMethodMenuItemChanged(
       ash::ime::InputMethodMenuManager* manager) OVERRIDE;
 
-  // Overridden from CrasAudioHandler::AudioObserver.
-  virtual void OnOutputVolumeChanged() OVERRIDE;
-  virtual void OnOutputMuteChanged() OVERRIDE;
-  virtual void OnInputGainChanged() OVERRIDE;
-  virtual void OnInputMuteChanged() OVERRIDE;
-  virtual void OnAudioNodesChanged() OVERRIDE;
-  virtual void OnActiveOutputNodeChanged() OVERRIDE;
-  virtual void OnActiveInputNodeChanged() OVERRIDE;
-
   // drive::JobListObserver overrides.
   virtual void OnJobAdded(const drive::JobInfo& job_info) OVERRIDE;