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

Unified Diff: chromeos/audio/cras_audio_handler.cc

Issue 2812223005: Display current output device icon in the floating volume row when switching output devices (Closed)
Patch Set: Address nits. Created 3 years, 8 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 | « ash/system/brightness/tray_brightness.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/audio/cras_audio_handler.cc
diff --git a/chromeos/audio/cras_audio_handler.cc b/chromeos/audio/cras_audio_handler.cc
index e4e35c44841d59d02148d2662d33dfffaf8fe9c1..653a92a4826ab8957b3790c3eb846454d9ed6b6b 100644
--- a/chromeos/audio/cras_audio_handler.cc
+++ b/chromeos/audio/cras_audio_handler.cc
@@ -1317,10 +1317,12 @@ void CrasAudioHandler::UpdateDevicesAndSwitchActive(
for (size_t i = 0; i < nodes.size(); ++i) {
AudioDevice device(nodes[i]);
audio_devices_[device.id] = device;
- if (!has_alternative_input_ &&
- device.is_input &&
+ if (!has_alternative_input_ && device.is_input &&
device.type != AUDIO_TYPE_INTERNAL_MIC &&
- device.type != AUDIO_TYPE_KEYBOARD_MIC) {
+ device.type != AUDIO_TYPE_KEYBOARD_MIC &&
+ device.type != AUDIO_TYPE_HOTWORD &&
+ device.type != AUDIO_TYPE_POST_MIX_LOOPBACK &&
+ device.type != AUDIO_TYPE_POST_DSP_LOOPBACK) {
has_alternative_input_ = true;
} else if (!has_alternative_output_ &&
!device.is_input &&
« no previous file with comments | « ash/system/brightness/tray_brightness.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698