Consolidate volume control code.

ash/system/tray/system_tray_delegate.h

Index: ash/system/tray/system_tray_delegate.h
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
index 6af67fe5a7e85e413bd94461a74747e6d2875954..918b0964015bf6fe818c432c9786699f24183f8f 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -13,6 +13,7 @@
 #include "ash/system/user/login_status.h"
 #include "base/file_path.h"
 #include "base/i18n/time_formatting.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "ui/gfx/image/image_skia.h"
 
@@ -96,6 +97,8 @@ struct ASH_EXPORT IMEInfo {
 
 typedef std::vector<IMEInfo> IMEInfoList;
 
+class VolumeControlDelegate;
+
 class SystemTrayDelegate {
  public:
   virtual ~SystemTrayDelegate() {}
@@ -142,18 +145,6 @@ class SystemTrayDelegate {
   // Shows help.
   virtual void ShowHelp() = 0;
 
-  // Is the system audio muted?
-  virtual bool IsAudioMuted() const = 0;
-
-  // Mutes/Unmutes the audio system.
-  virtual void SetAudioMuted(bool muted) = 0;
-
-  // Gets the volume level. The range is [0, 1.0].
-  virtual float GetVolumeLevel() const = 0;
-
-  // Sets the volume level. The range is [0, 1.0].
-  virtual void SetVolumeLevel(float level) = 0;
-
   // Gets whether the caps lock is on.
   virtual bool IsCapsLockOn() const = 0;
 
@@ -278,6 +269,14 @@ class SystemTrayDelegate {
 
   // Shows UI for changing proxy settings.
   virtual void ChangeProxySettings() = 0;
+
+  // Returns VolumeControlDelegate.
+  virtual VolumeControlDelegate* volume_control_delegate() const = 0;

[sky, 2012/08/14 20:09:57]

Virtual methods should not be unix_hacker_style.

[jennyz, 2012/08/14 21:12:13]

Done.

+
+  // Sets VolumeControlDelegate.
+  virtual void SetVolumeControlDelegate(
+      scoped_ptr<VolumeControlDelegate> delegate) = 0;
+
 };
 
 }  // namespace ash