| Index: ash/system/audio/tray_audio.h
|
| diff --git a/ash/system/audio/tray_audio.h b/ash/system/audio/tray_audio.h
|
| index 9d76bb92db85bff88a946a3cb3780e100c83743d..9573d64c55c7f4d5f3a45aaf5fc90f342aff8511 100644
|
| --- a/ash/system/audio/tray_audio.h
|
| +++ b/ash/system/audio/tray_audio.h
|
| @@ -8,6 +8,7 @@
|
| #include "ash/system/audio/audio_observer.h"
|
| #include "ash/system/tray/tray_image_item.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "ui/gfx/display_observer.h"
|
|
|
| namespace ash {
|
|
|
| @@ -20,7 +21,8 @@ class VolumeView;
|
| }
|
|
|
| class TrayAudio : public TrayImageItem,
|
| - public AudioObserver {
|
| + public AudioObserver,
|
| + public gfx::DisplayObserver {
|
| public:
|
| TrayAudio(SystemTray* system_tray,
|
| scoped_ptr<system::TrayAudioDelegate> audio_delegate);
|
| @@ -57,6 +59,14 @@ class TrayAudio : public TrayImageItem,
|
| virtual void OnActiveOutputNodeChanged() OVERRIDE;
|
| virtual void OnActiveInputNodeChanged() OVERRIDE;
|
|
|
| + // Overridden from gfx::DisplayObserver.
|
| + virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
|
| + virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
|
| + virtual void OnDisplayMetricsChanged(const gfx::Display& display,
|
| + uint32_t changed_metrics) OVERRIDE;
|
| +
|
| + void ChangeAudioChannelMode();
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(TrayAudio);
|
| };
|
|
|
|
|