Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Unified Diff: chrome/browser/ui/ash/volume_controller_chromeos.cc

Issue 2552483002: mash: Have chrome set itself as a controller interface for changing volume (Closed)
Patch Set: comment Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
deleted file mode 100644
index cc336c399b9a0724a5abeaa74857fe1ce9b366f2..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/ash/volume_controller_chromeos.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-// 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 "base/command_line.h"
-#include "chrome/browser/chromeos/accessibility/accessibility_manager.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 "media/audio/sounds/sounds_manager.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() {
- 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);
- if (audio_handler->IsOutputVolumeBelowDefaultMuteLevel())
- audio_handler->SetOutputMute(true);
- else
- PlayVolumeAdjustSound();
- }
-}
-
-void VolumeController::VolumeUp() {
- chromeos::CrasAudioHandler* audio_handler = chromeos::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();
-}
« no previous file with comments | « chrome/browser/ui/ash/volume_controller_chromeos.h ('k') | chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698