| Index: ash/system/audio/tray_audio.cc
|
| diff --git a/ash/system/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc
|
| index 0109f29327e1ef8d85e3106db61a08e40d7d4eb0..41340bd5eb50c13474dbbbb94ff39f6b7ca08b05 100644
|
| --- a/ash/system/audio/tray_audio.cc
|
| +++ b/ash/system/audio/tray_audio.cc
|
| @@ -113,14 +113,14 @@ void TrayAudio::OnOutputNodeVolumeChanged(uint64_t /* node_id */,
|
| PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
|
| }
|
|
|
| -void TrayAudio::OnOutputMuteChanged(bool /* mute_on */) {
|
| +void TrayAudio::OnOutputMuteChanged(bool /* mute_on */, bool system_adjust) {
|
| if (tray_view())
|
| tray_view()->SetVisible(GetInitialVisibility());
|
|
|
| if (volume_view_) {
|
| volume_view_->Update();
|
| SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
|
| - } else {
|
| + } else if (!system_adjust) {
|
| pop_up_volume_view_ = true;
|
| PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
|
| }
|
|
|