Use mojo volume interfaces for mash and classic ash.

chrome/browser/ui/ash/volume_controller_chromeos.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.

[James Cook, 2016/10/18 23:53:40]

nit: I don't think you need to update this.

[msw, 2016/10/19 15:24:10]

Done.

 // 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/volume_controller_chromeos.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/extensions/api/system_private/system_private_api.h"
 #include "chrome/grit/browser_resources.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/user_metrics.h"

[James Cook, 2016/10/18 23:53:40]

nit: remove?

[msw, 2016/10/19 15:24:10]

Done.

 #include "media/audio/sounds/sounds_manager.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using chromeos::CrasAudioHandler;
 
 namespace {
 
 // Percent by which the volume should be changed when a volume key is pressed.
 const double kStepPercentage = 4.0;
 
@@ skipping 20 matching lines @@
         chromeos::SOUND_VOLUME_ADJUST,
         bundle.GetRawDataResource(IDR_SOUND_VOLUME_ADJUST_WAV));
   }
 }
 
 VolumeController::~VolumeController() {
   if (CrasAudioHandler::IsInitialized())
     CrasAudioHandler::Get()->RemoveAudioObserver(this);
 }
 
-void VolumeController::HandleVolumeMute(const ui::Accelerator& accelerator) {
-  if (accelerator.key_code() == ui::VKEY_VOLUME_MUTE)
-    content::RecordAction(base::UserMetricsAction("Accel_VolumeMute_F8"));
+void VolumeController::BindRequest(
+    ash::mojom::VolumeControllerRequest request) {
+  bindings_.AddBinding(this, std::move(request));
+}
 
+void VolumeController::VolumeMute() {
   CrasAudioHandler::Get()->SetOutputMute(true);
 }
 
-void VolumeController::HandleVolumeDown(const ui::Accelerator& accelerator) {
-  if (accelerator.key_code() == ui::VKEY_VOLUME_DOWN)
-    content::RecordAction(base::UserMetricsAction("Accel_VolumeDown_F9"));
-
+void VolumeController::VolumeDown() {
   CrasAudioHandler* audio_handler = CrasAudioHandler::Get();
   if (audio_handler->IsOutputMuted()) {
     audio_handler->SetOutputVolumePercent(0);
   } else {
     audio_handler->AdjustOutputVolumeByPercent(-kStepPercentage);
     if (audio_handler->IsOutputVolumeBelowDefaultMuteLevel())
       audio_handler->SetOutputMute(true);
     else
       PlayVolumeAdjustSound();
   }
 }
 
-void VolumeController::HandleVolumeUp(const ui::Accelerator& accelerator) {
-  if (accelerator.key_code() == ui::VKEY_VOLUME_UP)
-    content::RecordAction(base::UserMetricsAction("Accel_VolumeUp_F10"));
-
+void VolumeController::VolumeUp() {
   CrasAudioHandler* audio_handler = CrasAudioHandler::Get();
   bool play_sound = false;
   if (audio_handler->IsOutputMuted()) {
     audio_handler->SetOutputMute(false);
     audio_handler->AdjustOutputVolumeToAudibleLevel();
     play_sound = true;
   } else {
     play_sound = audio_handler->GetOutputVolumePercent() != 100;
     audio_handler->AdjustOutputVolumeByPercent(kStepPercentage);
   }
 
   if (play_sound)
     PlayVolumeAdjustSound();
 }
 
 void VolumeController::OnOutputNodeVolumeChanged(uint64_t node_id, int volume) {
   CrasAudioHandler* audio_handler = CrasAudioHandler::Get();
   extensions::DispatchVolumeChangedEvent(
       audio_handler->GetOutputVolumePercent(),
       audio_handler->IsOutputMuted());
 }
 
 void VolumeController::OnOutputMuteChanged(bool /* mute_on */,
                                            bool /* system_adjust */) {
   CrasAudioHandler* audio_handler = CrasAudioHandler::Get();
   extensions::DispatchVolumeChangedEvent(
       audio_handler->GetOutputVolumePercent(),
       audio_handler->IsOutputMuted());
 }