| Index: ash/system/chromeos/audio/tray_audio_chromeos.cc
|
| diff --git a/ash/system/chromeos/audio/tray_audio_chromeos.cc b/ash/system/chromeos/audio/tray_audio_chromeos.cc
|
| index 1a99133cba8ecbc4a0e5cefd02796073422e97c1..9cf6b87c65d254697fe83798d2198fe155cd088d 100644
|
| --- a/ash/system/chromeos/audio/tray_audio_chromeos.cc
|
| +++ b/ash/system/chromeos/audio/tray_audio_chromeos.cc
|
| @@ -59,7 +59,7 @@ void TrayAudioChromeOs::DestroyDetailedView() {
|
| }
|
| }
|
|
|
| -void TrayAudioChromeOs::OnDisplayAdded(const gfx::Display& new_display) {
|
| +void TrayAudioChromeOs::OnDisplayAdded(const display::Display& new_display) {
|
| TrayAudio::OnDisplayAdded(new_display);
|
|
|
| // This event will be triggered when the lid of the device is opened to exit
|
| @@ -68,7 +68,7 @@ void TrayAudioChromeOs::OnDisplayAdded(const gfx::Display& new_display) {
|
| audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(true);
|
| }
|
|
|
| -void TrayAudioChromeOs::OnDisplayRemoved(const gfx::Display& old_display) {
|
| +void TrayAudioChromeOs::OnDisplayRemoved(const display::Display& old_display) {
|
| TrayAudio::OnDisplayRemoved(old_display);
|
|
|
| // This event will be triggered when the lid of the device is closed to enter
|
| @@ -77,7 +77,7 @@ void TrayAudioChromeOs::OnDisplayRemoved(const gfx::Display& old_display) {
|
| audio_delegate_->SetActiveHDMIOutoutRediscoveringIfNecessary(true);
|
| }
|
|
|
| -void TrayAudioChromeOs::OnDisplayMetricsChanged(const gfx::Display& display,
|
| +void TrayAudioChromeOs::OnDisplayMetricsChanged(const display::Display& display,
|
| uint32_t changed_metrics) {
|
| // The event could be triggered multiple times during the HDMI display
|
| // transition, we don't need to restart HDMI re-discovering grace period
|
|
|