chrome.audio API: treat mute as system wide property

extensions/browser/api/audio/audio_api.cc

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..319affa30b9aeca0f3de1865cdc7702e2ac05d70 100644
--- a/extensions/browser/api/audio/audio_api.cc
+++ b/extensions/browser/api/audio/audio_api.cc
@@ -59,14 +59,29 @@ void AudioAPI::OnLevelChanged(const std::string& id, int level) {
 }
 
 void AudioAPI::OnMuteChanged(bool is_input, bool is_muted) {
-  if (EventRouter::Get(browser_context_)) {
-    std::unique_ptr<base::ListValue> args =
-        audio::OnMuteChanged::Create(is_input, is_muted);
-    std::unique_ptr<Event> event(new Event(events::AUDIO_ON_MUTE_CHANGED,
-                                           audio::OnMuteChanged::kEventName,
-                                           std::move(args)));
-    EventRouter::Get(browser_context_)->BroadcastEvent(std::move(event));
-  }
+  EventRouter* event_router = EventRouter::Get(browser_context_);
+  if (!event_router)
+    return;
+
+  // Dispatch deprecated onMuteChanged event.
+  std::unique_ptr<base::ListValue> deprecated_event_args =
+      audio::OnMuteChanged::Create(is_input, is_muted);
+  std::unique_ptr<Event> deprecated_event(
+      new Event(events::AUDIO_ON_MUTE_CHANGED, audio::OnMuteChanged::kEventName,
+                std::move(deprecated_event_args)));
+  event_router->BroadcastEvent(std::move(deprecated_event));
+
+  // Dispatch onMuteStateChanged event.
+  audio::MuteStateChangedEvent mute_event;
+  mute_event.stream_type =
+      is_input ? audio::STREAM_TYPE_INPUT : audio::STREAM_TYPE_OUTPUT;
+  mute_event.value = is_muted;
+  std::unique_ptr<base::ListValue> event_args =
+      audio::OnMuteStateChanged::Create(mute_event);
+  std::unique_ptr<Event> event(new Event(events::AUDIO_ON_MUTE_STATE_CHANGED,
+                                         audio::OnMuteStateChanged::kEventName,
+                                         std::move(event_args)));
+  event_router->BroadcastEvent(std::move(event));
 }
 
 void AudioAPI::OnDevicesChanged(const DeviceInfoList& devices) {
@@ -129,13 +144,52 @@ ExtensionFunction::ResponseAction AudioSetPropertiesFunction::Run() {
   int gain_value = params->properties.gain.get() ?
       *params->properties.gain : -1;
 
-  if (!service->SetDeviceProperties(params->id, params->properties.is_muted,
-                                    volume_value, gain_value)) {
-    return RespondNow(Error("Could not set properties"));
+  if (!service->SetDeviceSoundLevel(params->id, volume_value, gain_value))
+    return RespondNow(Error("Could not set volume/gain properties"));
+
+  if (params->properties.is_muted.get() &&
+      !service->SetMuteForDevice(params->id, *params->properties.is_muted)) {
+    return RespondNow(Error("Could not set mute property."));
+  }
+
+  return RespondNow(NoArguments());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+ExtensionFunction::ResponseAction AudioSetMuteFunction::Run() {
+  std::unique_ptr<audio::SetMute::Params> params(
+      audio::SetMute::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+
+  AudioService* service =
+      AudioAPI::GetFactoryInstance()->Get(browser_context())->GetService();
+  DCHECK(service);
+
+  if (!service->SetMute(params->stream_type == audio::STREAM_TYPE_INPUT,
+                        params->value)) {
+    return RespondNow(Error("Could not set mute state."));
   }
   return RespondNow(NoArguments());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+ExtensionFunction::ResponseAction AudioGetMuteFunction::Run() {
+  std::unique_ptr<audio::GetMute::Params> params(
+      audio::GetMute::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+
+  AudioService* service =
+      AudioAPI::GetFactoryInstance()->Get(browser_context())->GetService();
+  DCHECK(service);
+
+  bool value = false;
+  if (!service->GetMute(params->stream_type == audio::STREAM_TYPE_INPUT,
+                        &value)) {
+    return RespondNow(Error("Could not get mute state."));
+  }
+  return RespondNow(ArgumentList(audio::GetMute::Results::Create(value)));
+}
+
 }  // namespace extensions