Use mojo volume interfaces for mash and classic ash.

chrome/browser/ui/ash/volume_controller_chromeos.h

Index: chrome/browser/ui/ash/volume_controller_chromeos.h
diff --git a/chrome/browser/ui/ash/volume_controller_chromeos.h b/chrome/browser/ui/ash/volume_controller_chromeos.h
index ea7c689a9a3ce5964db3eaae33543c403e4736ff..926e24fcf36e2cf3b21ecb8116d7c01202fd53b9 100644
--- a/chrome/browser/ui/ash/volume_controller_chromeos.h
+++ b/chrome/browser/ui/ash/volume_controller_chromeos.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
@@ -7,30 +7,34 @@
 
 #include <stdint.h>
 
-#include "ash/common/system/volume_control_delegate.h"
-#include "base/compiler_specific.h"
+#include "ash/public/interfaces/volume.mojom.h"
 #include "base/macros.h"
 #include "chromeos/audio/cras_audio_handler.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
 #include "ui/base/accelerators/accelerator.h"
 
 // A class which controls volume when F8-10 or a multimedia key for volume is
 // pressed.
-class VolumeController : public ash::VolumeControlDelegate,
+class VolumeController : public ash::mojom::VolumeController,
                          public chromeos::CrasAudioHandler::AudioObserver {
  public:
   VolumeController();
   ~VolumeController() override;
 
-  // Overridden from ash::VolumeControlDelegate:
-  void HandleVolumeMute(const ui::Accelerator& accelerator) override;
-  void HandleVolumeDown(const ui::Accelerator& accelerator) override;
-  void HandleVolumeUp(const ui::Accelerator& accelerator) override;
+  // Binds the mojom::VolumeController interface request to this object.
+  void BindRequest(ash::mojom::VolumeControllerRequest request);
+
+  // Overridden from ash::mojom::VolumeController:
+  void VolumeMute() override;
+  void VolumeDown() override;
+  void VolumeUp() override;
 
   // Overridden from chromeos::CrasAudioHandler::AudioObserver.
   void OnOutputNodeVolumeChanged(uint64_t node_id, int volume) override;
   void OnOutputMuteChanged(bool mute_on, bool system_adjust) override;
 
  private:
+  mojo::BindingSet<ash::mojom::VolumeController> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeController);
 };