Consolidate volume control code.

ash/system/status_area_widget.cc

 // Copyright (c) 2012 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.
 
 #include "ash/system/status_area_widget.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/network/network_observer.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/web_notification/web_notification_tray.h"
+#include "ash/volume_control_delegate.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
 namespace {
 
+class DummyVolumeControlDelegate : public VolumeControlDelegate {
+ public:
+  DummyVolumeControlDelegate() {}
+  virtual ~DummyVolumeControlDelegate() {}
+
+  virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) OVERRIDE {
+    return true;
+  }
+  virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE {
+    return true;
+  }
+  virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE {
+    return true;
+  }
+  virtual void SetVolumePercent(double percent) OVERRIDE {
+  }
+  virtual bool IsAudioMuted() const OVERRIDE {
+    return true;
+  }
+  virtual void SetAudioMuted(bool muted) OVERRIDE {
+  }
+  virtual float GetVolumeLevel() const OVERRIDE {
+    return 0.0;
+  }
+  virtual void SetVolumeLevel(float level) OVERRIDE {
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DummyVolumeControlDelegate);
+};
+
 class DummySystemTrayDelegate : public SystemTrayDelegate {
  public:
   DummySystemTrayDelegate()
-      : muted_(false),
-        wifi_enabled_(true),
+      : wifi_enabled_(true),
         cellular_enabled_(true),
         bluetooth_enabled_(true),
-        volume_(0.5),
-        caps_lock_enabled_(false) {
+        caps_lock_enabled_(false),
+        volume_control_delegate_(
+            ALLOW_THIS_IN_INITIALIZER_LIST(new DummyVolumeControlDelegate)) {
   }
 
   virtual ~DummySystemTrayDelegate() {}
 
  private:
   virtual bool GetTrayVisibilityOnStartup() OVERRIDE { return true; }
 
   // Overridden from SystemTrayDelegate:
   virtual const string16 GetUserDisplayName() const OVERRIDE {
     return UTF8ToUTF16("Über tray Über tray Über tray Über tray");
@@ skipping 40 matching lines @@
 
   virtual void ShowDriveSettings() OVERRIDE {
   }
 
   virtual void ShowIMESettings() OVERRIDE {
   }
 
   virtual void ShowHelp() OVERRIDE {
   }
 
-  virtual bool IsAudioMuted() const OVERRIDE {
-    return muted_;
-  }
-
-  virtual void SetAudioMuted(bool muted) OVERRIDE {
-    muted_ = muted;
-  }
-
-  virtual float GetVolumeLevel() const OVERRIDE {
-    return volume_;
-  }
-
-  virtual void SetVolumeLevel(float volume) OVERRIDE {
-    volume_ = volume;
-  }
-
   virtual bool IsCapsLockOn() const OVERRIDE {
     return caps_lock_enabled_;
   }
 
   virtual void SetCapsLockEnabled(bool enabled) OVERRIDE {
     caps_lock_enabled_ = enabled;
   }
 
   virtual void ShutDown() OVERRIDE {}
 
@@ skipping 133 matching lines @@
                                       std::string* setup_url) OVERRIDE {
     return false;
   }
 
   virtual void ShowCellularURL(const std::string& url) OVERRIDE {
   }
 
   virtual void ChangeProxySettings() OVERRIDE {
   }
 
-  bool muted_;
+  virtual VolumeControlDelegate* volume_control_delegate() const OVERRIDE {
+    return volume_control_delegate_.get();
+  }
+
+  virtual void SetVolumeControlDelegate(
+      scoped_ptr<VolumeControlDelegate> delegate) OVERRIDE {
+    volume_control_delegate_.swap(delegate);
+  }
+
+
   bool wifi_enabled_;
   bool cellular_enabled_;
   bool bluetooth_enabled_;
-  float volume_;
   bool caps_lock_enabled_;
   gfx::ImageSkia null_image_;
+  scoped_ptr<VolumeControlDelegate> volume_control_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DummySystemTrayDelegate);
 };
 
 }  // namespace
 
 namespace internal {
 
 StatusAreaWidget::StatusAreaWidget()
     : status_area_widget_delegate_(new internal::StatusAreaWidgetDelegate),
@@ skipping 94 matching lines @@
     return;
   login_status_ = login_status;
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace internal
 }  // namespace ash