Fix the UI issue for showing output muted in ash tray after the device wakes up with hdmi output re…

ash/system/audio/tray_audio.cc

 // Copyright 2014 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 "ash/system/audio/tray_audio.h"
 
 #include <cmath>
 
 #include "ash/ash_constants.h"
 #include "ash/display/display_manager.h"
@@ skipping 95 matching lines @@
 
   if (volume_view_) {
     volume_view_->SetVolumeLevel(percent);
     SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
     return;
   }
   pop_up_volume_view_ = true;
   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);
   }
 }
 
 void TrayAudio::OnAudioNodesChanged() {
   Update();
 }
 
 void TrayAudio::OnActiveOutputNodeChanged() {
@@ skipping 44 matching lines @@
   if (tray_view())
       tray_view()->SetVisible(GetInitialVisibility());
   if (volume_view_) {
     volume_view_->SetVolumeLevel(
         static_cast<float>(audio_delegate_->GetOutputVolumeLevel()) / 100.0f);
     volume_view_->Update();
   }
 }
 
 }  // namespace ash