OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" | 5 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/audio/sounds.h" | 8 #include "ash/audio/sounds.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
11 #include "chrome/browser/extensions/api/system_private/system_private_api.h" | 11 #include "chrome/browser/extensions/api/system_private/system_private_api.h" |
12 #include "chromeos/audio/chromeos_sounds.h" | 12 #include "chromeos/audio/chromeos_sounds.h" |
13 #include "chromeos/chromeos_switches.h" | 13 #include "chromeos/chromeos_switches.h" |
14 #include "content/public/browser/user_metrics.h" | 14 #include "content/public/browser/user_metrics.h" |
15 #include "grit/browser_resources.h" | 15 #include "grit/browser_resources.h" |
16 #include "media/audio/sounds/sounds_manager.h" | 16 #include "media/audio/sounds/sounds_manager.h" |
17 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
18 | 18 |
19 using chromeos::CrasAudioHandler; | 19 using chromeos::CrasAudioHandler; |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 // Percent by which the volume should be changed when a volume key is pressed. | 23 // Percent by which the volume should be changed when a volume key is pressed. |
24 const double kStepPercentage = 4.0; | 24 const double kStepPercentage = 4.0; |
25 | 25 |
26 bool VolumeAdjustSoundEnabled() { | 26 bool VolumeAdjustSoundEnabled() { |
27 return !CommandLine::ForCurrentProcess()->HasSwitch( | 27 return !base::CommandLine::ForCurrentProcess()->HasSwitch( |
28 chromeos::switches::kDisableVolumeAdjustSound); | 28 chromeos::switches::kDisableVolumeAdjustSound); |
29 } | 29 } |
30 | 30 |
31 void PlayVolumeAdjustSound() { | 31 void PlayVolumeAdjustSound() { |
32 if (VolumeAdjustSoundEnabled()) | 32 if (VolumeAdjustSoundEnabled()) |
33 ash::PlaySystemSoundIfSpokenFeedback(chromeos::SOUND_VOLUME_ADJUST); | 33 ash::PlaySystemSoundIfSpokenFeedback(chromeos::SOUND_VOLUME_ADJUST); |
34 } | 34 } |
35 | 35 |
36 } // namespace | 36 } // namespace |
37 | 37 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 audio_handler->GetOutputVolumePercent(), | 98 audio_handler->GetOutputVolumePercent(), |
99 audio_handler->IsOutputMuted()); | 99 audio_handler->IsOutputMuted()); |
100 } | 100 } |
101 | 101 |
102 void VolumeController::OnOutputMuteChanged() { | 102 void VolumeController::OnOutputMuteChanged() { |
103 CrasAudioHandler* audio_handler = CrasAudioHandler::Get(); | 103 CrasAudioHandler* audio_handler = CrasAudioHandler::Get(); |
104 extensions::DispatchVolumeChangedEvent( | 104 extensions::DispatchVolumeChangedEvent( |
105 audio_handler->GetOutputVolumePercent(), | 105 audio_handler->GetOutputVolumePercent(), |
106 audio_handler->IsOutputMuted()); | 106 audio_handler->IsOutputMuted()); |
107 } | 107 } |
OLD | NEW |