| Index: chrome/browser/extensions/api/tabs/tabs_api.cc
|
| diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
|
| index 83827fb16c30ebaace2bf039766634fd3036c383..11dc1df4b2b91b086995d5ae46edf4546b03f5a7 100644
|
| --- a/chrome/browser/extensions/api/tabs/tabs_api.cc
|
| +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
|
| @@ -1241,23 +1241,31 @@ bool TabsUpdateFunction::RunAsync() {
|
| }
|
|
|
| if (params->update_properties.muted.get()) {
|
| - if (chrome::IsTabAudioMutingFeatureEnabled()) {
|
| - if (!chrome::CanToggleAudioMute(contents)) {
|
| - WriteToConsole(
|
| - content::CONSOLE_MESSAGE_LEVEL_WARNING,
|
| - base::StringPrintf(
|
| - "Cannot update mute state for tab %d, tab has audio or video "
|
| - "currently being captured",
|
| - tab_id));
|
| - } else {
|
| - chrome::SetTabAudioMuted(contents, *params->update_properties.muted,
|
| - extension()->id());
|
| - }
|
| - } else {
|
| - WriteToConsole(content::CONSOLE_MESSAGE_LEVEL_WARNING,
|
| - base::StringPrintf(
|
| - "Failed to update mute state, --%s must be enabled",
|
| - switches::kEnableTabAudioMuting));
|
| + TabMutedResult tabMutedResult = chrome::SetTabAudioMuted(
|
| + contents, *params->update_properties.muted, extension()->id());
|
| + std::string msg = "";
|
| +
|
| + switch (tabMutedResult) {
|
| + case TAB_MUTED_RESULT_FAIL_NOT_ENABLED:
|
| + msg = base::StringPrintf(
|
| + "Failed to update mute state for tab %d, --%s must be enabled",
|
| + tab_id, switches::kEnableTabAudioMuting);
|
| + break;
|
| + case TAB_MUTED_RESULT_FAIL_TABCAPTURE:
|
| + msg = base::StringPrintf(
|
| + "Cannot update mute state for tab %d, tab has audio or video"
|
| + " currently being captured",
|
| + tab_id);
|
| + break;
|
| + case TAB_MUTED_RESULT_FAIL_RATE_LIMITED:
|
| + msg = base::StringPrintf(
|
| + "Rate limit exceeded when updating mute state for tab %d.", tab_id);
|
| + break;
|
| + case TAB_MUTED_RESULT_SUCCESS:
|
| + break;
|
| + }
|
| + if (msg != "") {
|
| + WriteToConsole(content::CONSOLE_MESSAGE_LEVEL_ERROR, msg);
|
| }
|
| }
|
|
|
|
|