ash/system/audio/tray_audio.h - Issue 1268593002: Fix the UI issue for showing output muted in ash tray after the device wakes up with hdmi output re…

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/system/audio/tray_audio.h

Issue 1268593002: Fix the UI issue for showing output muted in ash tray after the device wakes up with hdmi output re… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454

Patch Set: Created 5 years, 4 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 unified diff | Download patch

« no previous file with comments | « ash/system/audio/audio_observer.h ('k') | ash/system/audio/tray_audio.cc » ('j') | no next file with comments »

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 #ifndef ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_	5 #ifndef ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_

6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_	6 #define ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_

7	7

8 #include "ash/system/audio/audio_observer.h"	8 #include "ash/system/audio/audio_observer.h"

9 #include "ash/system/tray/tray_image_item.h"	9 #include "ash/system/tray/tray_image_item.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 // Overridden from SystemTrayItem.	53 // Overridden from SystemTrayItem.

54 views::View* CreateDefaultView(user::LoginStatus status) override;	54 views::View* CreateDefaultView(user::LoginStatus status) override;

55 views::View* CreateDetailedView(user::LoginStatus status) override;	55 views::View* CreateDetailedView(user::LoginStatus status) override;

56 void DestroyDefaultView() override;	56 void DestroyDefaultView() override;

57 void DestroyDetailedView() override;	57 void DestroyDetailedView() override;

58 bool ShouldHideArrow() const override;	58 bool ShouldHideArrow() const override;

59 bool ShouldShowShelf() const override;	59 bool ShouldShowShelf() const override;

60	60

61 // Overridden from AudioObserver.	61 // Overridden from AudioObserver.

62 void OnOutputNodeVolumeChanged(uint64_t node_id, double volume) override;	62 void OnOutputNodeVolumeChanged(uint64_t node_id, double volume) override;

63 void OnOutputMuteChanged(bool mute_on) override;	63 void OnOutputMuteChanged(bool mute_on, bool system_adjust) override;

64 void OnAudioNodesChanged() override;	64 void OnAudioNodesChanged() override;

65 void OnActiveOutputNodeChanged() override;	65 void OnActiveOutputNodeChanged() override;

66 void OnActiveInputNodeChanged() override;	66 void OnActiveInputNodeChanged() override;

67	67

68 void ChangeInternalSpeakerChannelMode();	68 void ChangeInternalSpeakerChannelMode();

69	69

70 DISALLOW_COPY_AND_ASSIGN(TrayAudio);	70 DISALLOW_COPY_AND_ASSIGN(TrayAudio);

71 };	71 };

72	72

73 } // namespace ash	73 } // namespace ash

74	74

75 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_	75 #endif // ASH_SYSTEM_AUDIO_TRAY_AUDIO_H_

OLD	NEW