ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc - Issue 596603002: Supports multiple active input/output audio nodes in CrasAudioHandler.

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

Unified Diff: ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc

Issue 596603002: Supports multiple active input/output audio nodes in CrasAudioHandler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix another api name change in shell_audio_controller_chromeos_unittest.cc. Created 6 years, 3 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

Index: ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc

diff --git a/ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc b/ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc

index 709db28abfd9d8c5dcbc3b9afc2132d314ce1874..4f39865c0dee9196534beee138834dd3877439cd 100644

--- a/ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc

+++ b/ash/system/chromeos/audio/tray_audio_delegate_chromeos.cc

@@ -26,7 +26,7 @@ int TrayAudioDelegateChromeOs::GetOutputVolumeLevel() {

int TrayAudioDelegateChromeOs::GetActiveOutputDeviceIconId() {

chromeos::AudioDevice device;

- if (!CrasAudioHandler::Get()->GetActiveOutputDevice(&device))

+ if (!CrasAudioHandler::Get()->GetPrimaryActiveOutputDevice(&device))

return kNoAudioDeviceIcon;

if (device.type == chromeos::AUDIO_TYPE_HEADPHONE)

« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | chromeos/audio/cras_audio_handler.h » ('J')