Use mojo volume interfaces for mash and classic ash.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 10 matching lines @@
 #include "ash/common/system/chromeos/session/logout_button_observer.h"
 #include "ash/common/system/chromeos/shutdown_policy_observer.h"
 #include "ash/common/system/date/clock_observer.h"
 #include "ash/common/system/ime/ime_observer.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/system/update/update_observer.h"
 #include "ash/common/system/user/user_observer.h"
-#include "ash/common/system/volume_control_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
 #include "ash/wm/lock_state_controller.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 24 matching lines @@
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/ui/ash/cast_config_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/cast_config_delegate_media_router.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_utils.h"
-#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
 #include "chrome/browser/ui/ash/vpn_delegate_chromeos.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ skipping 78 matching lines @@
 
 SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
     : user_profile_(NULL),
       search_key_mapped_to_(input_method::kSearchKey),
       have_session_start_time_(false),
       have_session_length_limit_(false),
       should_run_bluetooth_discovery_(false),
       session_started_(false),
       cast_config_delegate_(nullptr),
       networking_config_delegate_(new NetworkingConfigDelegateChromeos()),
-      volume_control_delegate_(new VolumeController()),
       vpn_delegate_(new VPNDelegateChromeOS),
       weak_ptr_factory_(this) {
   // Register notifications on construction so that events such as
   // PROFILE_CREATED do not get missed if they happen before Initialize().
   registrar_.reset(new content::NotificationRegistrar);
   registrar_->Add(this,
                   chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                   content::NotificationService::AllSources());
   registrar_->Add(this,
                   chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
@@ skipping 410 matching lines @@
   if (!cast_config_delegate_)
     cast_config_delegate_ = CreateCastConfigDelegate();
   return cast_config_delegate_.get();
 }
 
 ash::NetworkingConfigDelegate*
 SystemTrayDelegateChromeOS::GetNetworkingConfigDelegate() const {
   return networking_config_delegate_.get();
 }
 
-ash::VolumeControlDelegate*
-SystemTrayDelegateChromeOS::GetVolumeControlDelegate() const {
-  return volume_control_delegate_.get();
-}
-
-void SystemTrayDelegateChromeOS::SetVolumeControlDelegate(
-    std::unique_ptr<ash::VolumeControlDelegate> delegate) {
-  volume_control_delegate_.swap(delegate);
-}
-
 bool SystemTrayDelegateChromeOS::GetSessionStartTime(
     base::TimeTicks* session_start_time) {
   *session_start_time = session_start_time_;
   return have_session_start_time_;
 }
 
 bool SystemTrayDelegateChromeOS::GetSessionLengthLimit(
     base::TimeDelta* session_length_limit) {
   *session_length_limit = session_length_limit_;
   return have_session_length_limit_;
@@ skipping 498 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos