| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/common/system/chromeos/audio/tray_audio_chromeos.h" | 5 #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h" |
| 6 | 6 |
| 7 #include "ash/common/system/audio/volume_view.h" | 7 #include "ash/common/system/audio/volume_view.h" |
| 8 #include "ash/common/system/chromeos/audio/audio_detailed_view.h" | 8 #include "ash/common/system/chromeos/audio/audio_detailed_view.h" |
| 9 #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h" | 9 #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h" |
| 10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 TrayAudio::OnDisplayRemoved(old_display); | 71 TrayAudio::OnDisplayRemoved(old_display); |
| 72 | 72 |
| 73 // This event will be triggered when the lid of the device is closed to enter | 73 // This event will be triggered when the lid of the device is closed to enter |
| 74 // the docked mode, we should always start or re-start HDMI re-discovering | 74 // the docked mode, we should always start or re-start HDMI re-discovering |
| 75 // grace period right after this event. | 75 // grace period right after this event. |
| 76 audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(true); | 76 audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(true); |
| 77 } | 77 } |
| 78 | 78 |
| 79 void TrayAudioChromeOs::OnDisplayMetricsChanged(const display::Display& display, | 79 void TrayAudioChromeOs::OnDisplayMetricsChanged(const display::Display& display, |
| 80 uint32_t changed_metrics) { | 80 uint32_t changed_metrics) { |
| 81 TrayAudio::OnDisplayMetricsChanged(display, changed_metrics); |
| 82 |
| 81 // The event could be triggered multiple times during the HDMI display | 83 // The event could be triggered multiple times during the HDMI display |
| 82 // transition, we don't need to restart HDMI re-discovering grace period | 84 // transition, we don't need to restart HDMI re-discovering grace period |
| 83 // it is already started earlier. | 85 // it is already started earlier. |
| 84 audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(false); | 86 audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(false); |
| 85 } | 87 } |
| 86 | 88 |
| 87 void TrayAudioChromeOs::SuspendDone(const base::TimeDelta& sleep_duration) { | 89 void TrayAudioChromeOs::SuspendDone(const base::TimeDelta& sleep_duration) { |
| 88 // This event is triggered when the device resumes after earlier suspension, | 90 // This event is triggered when the device resumes after earlier suspension, |
| 89 // we should always start or re-start HDMI re-discovering | 91 // we should always start or re-start HDMI re-discovering |
| 90 // grace period right after this event. | 92 // grace period right after this event. |
| 91 audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(true); | 93 audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(true); |
| 92 } | 94 } |
| 93 | 95 |
| 94 } // namespace ash | 96 } // namespace ash |
| OLD | NEW |