Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: ash/system/audio/tray_audio.h

Issue 1199413008: Work around for HDMI audio output rediscovering transistion loss. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/system/audio/tray_audio.cc » ('j') | ash/system/audio/tray_audio.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/audio/tray_audio.h
diff --git a/ash/system/audio/tray_audio.h b/ash/system/audio/tray_audio.h
index 9d3b2c94463bb210fae73ef392743d1ee5421a98..caf5760cad0fce65c5cb7c3a665327bbb9d14b4d 100644
--- a/ash/system/audio/tray_audio.h
+++ b/ash/system/audio/tray_audio.h
@@ -31,6 +31,12 @@ class TrayAudio : public TrayImageItem,
static bool ShowAudioDeviceMenu();
protected:
+ // Overridden from gfx::DisplayObserver.
+ void OnDisplayAdded(const gfx::Display& new_display) override;
+ void OnDisplayRemoved(const gfx::Display& old_display) override;
+ void OnDisplayMetricsChanged(const gfx::Display& display,
+ uint32_t changed_metrics) override;
+
virtual void Update();
scoped_ptr<system::TrayAudioDelegate> audio_delegate_;
@@ -59,12 +65,6 @@ class TrayAudio : public TrayImageItem,
void OnActiveOutputNodeChanged() override;
void OnActiveInputNodeChanged() override;
- // Overridden from gfx::DisplayObserver.
- void OnDisplayAdded(const gfx::Display& new_display) override;
- void OnDisplayRemoved(const gfx::Display& old_display) override;
- void OnDisplayMetricsChanged(const gfx::Display& display,
- uint32_t changed_metrics) override;
-
void ChangeInternalSpeakerChannelMode();
DISALLOW_COPY_AND_ASSIGN(TrayAudio);
« no previous file with comments | « no previous file | ash/system/audio/tray_audio.cc » ('j') | ash/system/audio/tray_audio.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698