mash: Have chrome set itself as a controller interface for changing volume

chrome/browser/ui/ash/volume_controller.cc

Index: chrome/browser/ui/ash/volume_controller.cc
diff --git a/chrome/browser/ui/ash/volume_controller_chromeos.cc b/chrome/browser/ui/ash/volume_controller.cc
similarity index 77%
rename from chrome/browser/ui/ash/volume_controller_chromeos.cc
rename to chrome/browser/ui/ash/volume_controller.cc
index cc336c399b9a0724a5abeaa74857fe1ce9b366f2..e0184f291085007f6459271786eab5b360f4e0e4 100644
--- a/chrome/browser/ui/ash/volume_controller_chromeos.cc
+++ b/chrome/browser/ui/ash/volume_controller.cc
@@ -2,15 +2,18 @@
 // 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 "chrome/browser/ui/ash/volume_controller.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
+#include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/grit/browser_resources.h"
 #include "chromeos/audio/chromeos_sounds.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/chromeos_switches.h"
+#include "content/public/common/service_manager_connection.h"
 #include "media/audio/sounds/sounds_manager.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
@@ -33,7 +36,16 @@ void PlayVolumeAdjustSound() {
 
 }  // namespace
 
-VolumeController::VolumeController() {
+VolumeController::VolumeController() : binding_(this) {
+  // Connect to the volume interface in the ash service.
+  service_manager::Connector* connector =
+      content::ServiceManagerConnection::GetForProcess()->GetConnector();
+  ash::mojom::VolumePtr volume_ptr;
+  connector->ConnectToInterface(ash_util::GetAshServiceName(), &volume_ptr);
+
+  // Register this object as the client interface implementation.

[msw, 2016/12/05 20:15:09]

nit: "client interface implementation" doesn't seem self-explanatory to me.

[James Cook, 2016/12/06 19:23:57]

Done.

+  volume_ptr->SetClient(binding_.CreateInterfacePtrAndBind());
+
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   if (VolumeAdjustSoundEnabled()) {
     media::SoundsManager::Get()->Initialize(
@@ -44,11 +56,6 @@ VolumeController::VolumeController() {
 
 VolumeController::~VolumeController() {}
 
-void VolumeController::BindRequest(
-    ash::mojom::VolumeControllerRequest request) {
-  bindings_.AddBinding(this, std::move(request));
-}
-
 void VolumeController::VolumeMute() {
   chromeos::CrasAudioHandler::Get()->SetOutputMute(true);
 }