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

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

Issue 2605983002: Simplify logic behind chrome.audio.setActiveDevices (Closed)
Patch Set: . Created 3 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/audio/cras_audio_handler_unittest.cc ('k') | extensions/browser/api/audio/audio_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/audio/audio_api.cc
diff --git a/extensions/browser/api/audio/audio_api.cc b/extensions/browser/api/audio/audio_api.cc
index 39614ccdb4f1a2d0e8e67501c52f45a4286428de..53bd0da17f5cb2838c3d4de6f8af69d55ce490e8 100644
--- a/extensions/browser/api/audio/audio_api.cc
+++ b/extensions/browser/api/audio/audio_api.cc
@@ -108,7 +108,18 @@ ExtensionFunction::ResponseAction AudioSetActiveDevicesFunction::Run() {
AudioAPI::GetFactoryInstance()->Get(browser_context())->GetService();
DCHECK(service);
- service->SetActiveDevices(params->ids);
+ if (params->ids.as_device_id_lists) {
+ if (!service->SetActiveDeviceLists(
+ params->ids.as_device_id_lists->input,
+ params->ids.as_device_id_lists->output)) {
+ return RespondNow(Error("Failed to set active devices."));
+ }
+ } else if (params->ids.as_strings) {
+ // TODO(tbarzic): This way of setting active devices is deprecated - have
+ // this return error for apps that were not whitelisted for deprecated
+ // version of audio API.
+ service->SetActiveDevices(*params->ids.as_strings);
+ }
return RespondNow(NoArguments());
}
« no previous file with comments | « chromeos/audio/cras_audio_handler_unittest.cc ('k') | extensions/browser/api/audio/audio_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698