diff options
| author | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 01:14:57 +0000 |
|---|---|---|
| committer | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 01:14:57 +0000 |
| commit | 275aea7ea0da2d53698cdea143efa19d424e586e (patch) | |
| tree | 75d3a1da07cfe623a76a8b1d80e58f887116881b /content/browser | |
| parent | a8c05fb32537aa53688a390f01c7c5fad8946091 (diff) | |
| download | chromium_src-275aea7ea0da2d53698cdea143efa19d424e586e.zip chromium_src-275aea7ea0da2d53698cdea143efa19d424e586e.tar.gz chromium_src-275aea7ea0da2d53698cdea143efa19d424e586e.tar.bz2 | |
Put enabling of tab audio notifications behind a command-line switch.
With this change, the tab audio output indicator (i.e., favicon animation) will be off by default for M28. New goal is M29 (for UI improvements).
BUG=178934
Review URL: https://chromiumcodereview.appspot.com/14001013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/renderer_host/media/audio_renderer_host.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc index 5f95a09..3b21720 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.cc +++ b/content/browser/renderer_host/media/audio_renderer_host.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/process.h" #include "base/shared_memory.h" @@ -16,6 +17,7 @@ #include "content/common/media/audio_messages.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/media_observer.h" +#include "content/public/common/content_switches.h" #include "media/audio/shared_memory_util.h" #include "media/base/audio_bus.h" #include "media/base/limits.h" @@ -238,9 +240,12 @@ void AudioRendererHost::DoNotifyAudibleState(AudioEntry* entry, << "::DoNotifyAudibleState(is_audible=" << is_audible << ") for stream_id=" << entry->stream_id(); - media_observer->OnAudioStreamPlayingChanged( - render_process_id_, entry->render_view_id(), entry->stream_id(), - is_audible); + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableAudibleNotifications)) { + media_observer->OnAudioStreamPlayingChanged( + render_process_id_, entry->render_view_id(), entry->stream_id(), + is_audible); + } } } |