Chromium Code Reviews| 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 b8fdff3ea36a3c838f1a38706e6ffcee1c9aefc0..9ac19d45a9153471943bd814fd4e8d988b12833a 100644 |
| --- a/chrome/browser/ui/ash/volume_controller_chromeos.cc |
| +++ b/chrome/browser/ui/ash/volume_controller_chromeos.cc |
| @@ -5,9 +5,15 @@ |
| #include "chrome/browser/ui/ash/volume_controller_chromeos.h" |
| #include "ash/ash_switches.h" |
| +#include "base/command_line.h" |
| #include "chrome/browser/browser_process.h" |
| #include "chrome/browser/extensions/api/system_private/system_private_api.h" |
| +#include "chromeos/audio/chromeos_sounds.h" |
| +#include "chromeos/chromeos_switches.h" |
| #include "content/public/browser/user_metrics.h" |
| +#include "grit/browser_resources.h" |
| +#include "media/audio/sounds/sounds_manager.h" |
| +#include "ui/base/resource/resource_bundle.h" |
| using chromeos::CrasAudioHandler; |
| @@ -16,10 +22,21 @@ namespace { |
| // Percent by which the volume should be changed when a volume key is pressed. |
| const double kStepPercentage = 4.0; |
| +void PlayVolumeAdjustSound() { |
| + if (CommandLine::ForCurrentProcess()->HasSwitch( |
| + chromeos::switches::kEnableVolumeAdjustSound)) { |
| + media::SoundsManager::Get()->Play(chromeos::SOUND_VOLUME_ADJUST); |
| + } |
| +} |
| + |
| } // namespace |
| VolumeController::VolumeController() { |
| CrasAudioHandler::Get()->AddAudioObserver(this); |
| + ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); |
| + media::SoundsManager::Get()->Initialize( |
| + chromeos::SOUND_VOLUME_ADJUST, |
| + bundle.GetRawDataResource(IDR_SOUND_VOLUME_ADJUST_WAV)); |
| } |
| VolumeController::~VolumeController() { |
| @@ -47,6 +64,8 @@ bool VolumeController::HandleVolumeDown(const ui::Accelerator& accelerator) { |
| if (audio_handler->IsOutputVolumeBelowDefaultMuteLvel()) |
| audio_handler->SetOutputMute(true); |
| } |
| + |
| + PlayVolumeAdjustSound(); |
|
DaleCurtis
2014/01/02 20:11:17
Generally these stop playing when volume reaches t
ygorshenin1
2014/01/09 19:26:57
Done.
|
| return true; |
| } |
| @@ -62,6 +81,7 @@ bool VolumeController::HandleVolumeUp(const ui::Accelerator& accelerator) { |
| audio_handler->AdjustOutputVolumeByPercent(kStepPercentage); |
| } |
| + PlayVolumeAdjustSound(); |
|
DaleCurtis
2014/01/02 20:11:17
Ditto, stop at 100% ?
ygorshenin1
2014/01/09 19:26:57
Done.
|
| return true; |
| } |