Index: chrome/browser/ui/ash/volume_controller_chromeos.cc |
diff --git a/chrome/browser/ui/ash/volume_controller_chromeos.cc b/chrome/browser/ui/ash/volume_controller_chromeos.cc |
index 68dd5928b4e39576e48953f9e9512a0b8257f21c..b06bde14c201c17fa83cb9acdc0b6ee87028a5d1 100644 |
--- a/chrome/browser/ui/ash/volume_controller_chromeos.cc |
+++ b/chrome/browser/ui/ash/volume_controller_chromeos.cc |
@@ -5,13 +5,11 @@ |
#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" |
#include "media/audio/sounds/sounds_manager.h" |
#include "ui/base/resource/resource_bundle.h" |
@@ -52,17 +50,16 @@ VolumeController::~VolumeController() { |
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); |
@@ -75,10 +72,7 @@ void VolumeController::HandleVolumeDown(const ui::Accelerator& accelerator) { |
} |
} |
-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()) { |