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

Unified Diff: extensions/browser/api/audio/audio_apitest.cc

Issue 1380103003: Store audio device's active state in preference (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix string format Created 4 years, 11 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 | « chromeos/dbus/cras_audio_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/audio/audio_apitest.cc
diff --git a/extensions/browser/api/audio/audio_apitest.cc b/extensions/browser/api/audio/audio_apitest.cc
index 2fc0ce4bf18de09b4b647debd1b9450688fe9088..d53bcd5e88e8d995e0aa943a454d184dd353ce1b 100644
--- a/extensions/browser/api/audio/audio_apitest.cc
+++ b/extensions/browser/api/audio/audio_apitest.cc
@@ -33,6 +33,7 @@ const uint64_t kWebcamMicId = 40003;
const AudioNode kJabraSpeaker1(false,
kJabraSpeaker1Id,
+ kJabraSpeaker1Id,
"Jabra Speaker",
"USB",
"Jabra Speaker 1",
@@ -41,6 +42,7 @@ const AudioNode kJabraSpeaker1(false,
const AudioNode kJabraSpeaker2(false,
kJabraSpeaker2Id,
+ kJabraSpeaker2Id,
"Jabra Speaker",
"USB",
"Jabra Speaker 2",
@@ -49,20 +51,34 @@ const AudioNode kJabraSpeaker2(false,
const AudioNode kHDMIOutput(false,
kHDMIOutputId,
+ kHDMIOutputId,
"HDMI output",
"HDMI",
"HDA Intel MID",
false,
0);
-const AudioNode
- kJabraMic1(true, kJabraMic1Id, "Jabra Mic", "USB", "Jabra Mic 1", false, 0);
-
-const AudioNode
- kJabraMic2(true, kJabraMic2Id, "Jabra Mic", "USB", "Jabra Mic 2", false, 0);
+const AudioNode kJabraMic1(true,
+ kJabraMic1Id,
+ kJabraMic1Id,
+ "Jabra Mic",
+ "USB",
+ "Jabra Mic 1",
+ false,
+ 0);
+
+const AudioNode kJabraMic2(true,
+ kJabraMic2Id,
+ kJabraMic2Id,
+ "Jabra Mic",
+ "USB",
+ "Jabra Mic 2",
+ false,
+ 0);
const AudioNode kUSBCameraMic(true,
kWebcamMicId,
+ kWebcamMicId,
"Webcam Mic",
"USB",
"Logitech Webcam",
« no previous file with comments | « chromeos/dbus/cras_audio_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698