Consolidate volume control code.

chrome/browser/chromeos/system/ash_system_tray_delegate.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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/brightness/brightness_observer.h"
 #include "ash/system/date/clock_observer.h"
 #include "ash/system/drive/drive_observer.h"
 #include "ash/system/ime/ime_observer.h"
 #include "ash/system/network/network_observer.h"
 #include "ash/system/power/power_status_observer.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/tray_caps_lock.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/user/update_observer.h"
 #include "ash/system/user/user_observer.h"
+#include "ash/volume_control_delegate.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/status/data_promo_notification.h"
 #include "chrome/browser/chromeos/status/network_menu.h"
 #include "chrome/browser/chromeos/status/network_menu_icon.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
@@ skipping 95 matching lines @@
             new base::WeakPtrFactory<SystemTrayDelegate>(this))),
         network_icon_(ALLOW_THIS_IN_INITIALIZER_LIST(
                       new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
         network_icon_dark_(ALLOW_THIS_IN_INITIALIZER_LIST(
                       new NetworkMenuIcon(this, NetworkMenuIcon::MENU_MODE))),
         network_menu_(ALLOW_THIS_IN_INITIALIZER_LIST(new NetworkMenu(this))),
         clock_type_(base::k24HourClock),
         search_key_mapped_to_(input_method::kSearchKey),
         screen_locked_(false),
         connected_network_state_(STATE_UNKNOWN),
-        data_promo_notification_(new DataPromoNotification()) {
+        data_promo_notification_(new DataPromoNotification()),
+        volume_control_delegate_(ALLOW_THIS_IN_INITIALIZER_LIST(
+            new VolumeController)) {
     AudioHandler::GetInstance()->AddVolumeObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RequestStatusUpdate(
         PowerManagerClient::UPDATE_INITIAL);
     DBusThreadManager::Get()->GetSessionManagerClient()->AddObserver(this);
 
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
     crosnet->AddNetworkManagerObserver(this);
     OnNetworkManagerChanged(crosnet);
     crosnet->AddCellularDataPlanObserver(this);
@@ skipping 145 matching lines @@
     content::RecordAction(
         content::UserMetricsAction("OpenLanguageOptionsDialog"));
     chrome::ShowSettingsSubPage(GetAppropriateBrowser(),
                                 chrome::kLanguageOptionsSubPage);
   }
 
   virtual void ShowHelp() OVERRIDE {
     chrome::ShowHelp(GetAppropriateBrowser(), chrome::HELP_SOURCE_MENU);
   }
 
-  virtual bool IsAudioMuted() const OVERRIDE {
-    return AudioHandler::GetInstance()->IsMuted();
-  }
-
-  virtual void SetAudioMuted(bool muted) OVERRIDE {
-    return AudioHandler::GetInstance()->SetMuted(muted);
-  }
-
-  virtual float GetVolumeLevel() const OVERRIDE {
-    return AudioHandler::GetInstance()->GetVolumePercent() / 100.f;
-  }
-
-  virtual void SetVolumeLevel(float level) OVERRIDE {
-    AudioHandler::GetInstance()->SetVolumePercent(level * 100.f);
-  }
-
   virtual bool IsCapsLockOn() const OVERRIDE {
     input_method::InputMethodManager* ime_manager =
         input_method::InputMethodManager::GetInstance();
     return ime_manager->GetXKeyboard()->CapsLockIsEnabled();
   }
 
   virtual void SetCapsLockEnabled(bool enabled) OVERRIDE {
     input_method::InputMethodManager* ime_manager =
         input_method::InputMethodManager::GetInstance();
     return ime_manager->GetXKeyboard()->SetCapsLockEnabled(enabled);
@@ skipping 348 matching lines @@
 
   virtual void ShowCellularURL(const std::string& url) OVERRIDE {
     chrome::ShowSingletonTab(GetAppropriateBrowser(), GURL(url));
   }
 
   virtual void ChangeProxySettings() OVERRIDE {
     CHECK(GetUserLoginStatus() == ash::user::LOGGED_IN_NONE);
     BaseLoginDisplayHost::default_host()->OpenProxySettings();
   }
 
+  virtual ash::VolumeControlDelegate* volume_control_delegate() const OVERRIDE {
+    return volume_control_delegate_.get();
+  }
+
+  virtual void SetVolumeControlDelegate(

[sadrul, 2012/08/14 18:12:52]

SetVolumeControlDelegate doesn't seem to be used anywhere. Is this for tests?

[jennyz, 2012/08/14 18:15:30]

Yes, this is only used for testing.

+      scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE {
+    volume_control_delegate_.swap(delegate);
+  }
  private:
   // Returns the last active browser. If there is no such browser, creates a new
   // browser window with an empty tab and returns it.
   Browser* GetAppropriateBrowser() {
     return browser::FindOrCreateTabbedBrowser(
         ProfileManager::GetDefaultProfileOrOffTheRecord());
   }
 
   void SetProfile(Profile* profile) {
     pref_registrar_.reset(new PrefChangeRegistrar);
@@ skipping 509 matching lines @@
   bool screen_locked_;
   ConnectionState connected_network_state_;
   std::string connected_network_path_;
 
   scoped_refptr<BluetoothAdapter> bluetooth_adapter_;
 
   BooleanPrefMember accessibility_enabled_;
 
   scoped_ptr<DataPromoNotification> data_promo_notification_;
 
+  scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
+
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos