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

chrome/browser/ui/ash/volume_controller.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/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 {
 
 // Percent by which the volume should be changed when a volume key is pressed.
 const double kStepPercentage = 4.0;
 
 bool VolumeAdjustSoundEnabled() {
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
       chromeos::switches::kDisableVolumeAdjustSound);
 }
 
 void PlayVolumeAdjustSound() {
   if (VolumeAdjustSoundEnabled()) {
     chromeos::AccessibilityManager::Get()->PlayEarcon(
         chromeos::SOUND_VOLUME_ADJUST,
         chromeos::PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
   }
 }
 
 }  // 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(
         chromeos::SOUND_VOLUME_ADJUST,
         bundle.GetRawDataResource(IDR_SOUND_VOLUME_ADJUST_WAV));
   }
 }
 
 VolumeController::~VolumeController() {}
 
-void VolumeController::BindRequest(
-    ash::mojom::VolumeControllerRequest request) {
-  bindings_.AddBinding(this, std::move(request));
-}
-
 void VolumeController::VolumeMute() {
   chromeos::CrasAudioHandler::Get()->SetOutputMute(true);
 }
 
 void VolumeController::VolumeDown() {
   chromeos::CrasAudioHandler* audio_handler = chromeos::CrasAudioHandler::Get();
   if (audio_handler->IsOutputMuted()) {
     audio_handler->SetOutputVolumePercent(0);
   } else {
     audio_handler->AdjustOutputVolumeByPercent(-kStepPercentage);
@@ skipping 12 matching lines @@
     audio_handler->AdjustOutputVolumeToAudibleLevel();
     play_sound = true;
   } else {
     play_sound = audio_handler->GetOutputVolumePercent() != 100;
     audio_handler->AdjustOutputVolumeByPercent(kStepPercentage);
   }
 
   if (play_sound)
     PlayVolumeAdjustSound();
 }