diff options
| author | jennyz <jennyz@chromium.org> | 2015-07-28 16:04:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-28 23:05:22 +0000 |
| commit | c79ccda3ba8d2259370e7cc25dc62117750e6496 (patch) | |
| tree | c73a4e229871f6df6a09f693211f3d8aa2908e18 /extensions/shell | |
| parent | 0444616094fcba557a06eb292ebd568281f82c84 (diff) | |
| download | chromium_src-c79ccda3ba8d2259370e7cc25dc62117750e6496.zip chromium_src-c79ccda3ba8d2259370e7cc25dc62117750e6496.tar.gz chromium_src-c79ccda3ba8d2259370e7cc25dc62117750e6496.tar.bz2 | |
Fix the UI issue for showing output muted in ash tray after the device wakes up with hdmi output removed.
BUG=512601
TBR=mnissler,derat, rkc
Review URL: https://codereview.chromium.org/1262723002
Cr-Commit-Position: refs/heads/master@{#340794}
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/browser/shell_audio_controller_chromeos.cc | 4 | ||||
| -rw-r--r-- | extensions/shell/browser/shell_audio_controller_chromeos.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/shell/browser/shell_audio_controller_chromeos.cc b/extensions/shell/browser/shell_audio_controller_chromeos.cc index 550c56c..19e34ce2 100644 --- a/extensions/shell/browser/shell_audio_controller_chromeos.cc +++ b/extensions/shell/browser/shell_audio_controller_chromeos.cc @@ -39,8 +39,8 @@ void ShellAudioController::OnOutputNodeVolumeChanged(uint64_t /* node_id */, int /* volume */) { } -void ShellAudioController::OnOutputMuteChanged(bool /* mute_on */) { -} +void ShellAudioController::OnOutputMuteChanged(bool /* mute_on */, + bool /* system_adjust */) {} void ShellAudioController::OnInputNodeGainChanged(uint64_t /* node_id */, int /* gain */) { diff --git a/extensions/shell/browser/shell_audio_controller_chromeos.h b/extensions/shell/browser/shell_audio_controller_chromeos.h index 0f47352..e93a66d 100644 --- a/extensions/shell/browser/shell_audio_controller_chromeos.h +++ b/extensions/shell/browser/shell_audio_controller_chromeos.h @@ -18,7 +18,7 @@ class ShellAudioController : public chromeos::CrasAudioHandler::AudioObserver { // chromeos::CrasAudioHandler::Observer implementation: void OnOutputNodeVolumeChanged(uint64_t node_id, int volume) override; - void OnOutputMuteChanged(bool mute_on) override; + void OnOutputMuteChanged(bool mute_on, bool system_adjust) override; void OnInputNodeGainChanged(uint64_t node_id, int gain) override; void OnInputMuteChanged(bool mute_on) override; void OnAudioNodesChanged() override; |