summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-26 01:40:06 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-26 01:40:06 +0000
commit9b898c683bca26829f8ef7271fe383e84216e4a8 (patch)
tree40955dcf8d62642ec88c2cc4dc7bc33ed8bce4d5 /content
parentde23b25f372af316d633dd27a8ea2319d2f2b0e8 (diff)
downloadchromium_src-9b898c683bca26829f8ef7271fe383e84216e4a8.zip
chromium_src-9b898c683bca26829f8ef7271fe383e84216e4a8.tar.gz
chromium_src-9b898c683bca26829f8ef7271fe383e84216e4a8.tar.bz2
chromeos: Don't report audio/video from RenderViewHostImpl.
This disables reporting of web audio and video from within RenderViewHostImpl::OnMediaNotification() on Chrome OS. There are existing mechanisms for detecting audio and video there (audio via the power manager asking the Chrome OS audio server about open channels, video via ash::VideoDetector) and the PowerSaveBlocker class used by OnMediaNotification() interacts poorly with the power-management-related preferences that have been added on Chrome OS. BUG=176405 Review URL: https://chromiumcodereview.appspot.com/12310056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_view_host_impl.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 979f2c7..3bc3b3c 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -1941,6 +1941,8 @@ void RenderViewHostImpl::OnMediaNotification(int64 player_cookie,
bool has_video,
bool has_audio,
bool is_playing) {
+ // Chrome OS does its own detection of audio and video.
+#if !defined(OS_CHROMEOS)
if (is_playing) {
scoped_ptr<PowerSaveBlocker> blocker;
if (has_video) {
@@ -1959,6 +1961,7 @@ void RenderViewHostImpl::OnMediaNotification(int64 player_cookie,
delete power_save_blockers_[player_cookie];
power_save_blockers_.erase(player_cookie);
}
+#endif
}
void RenderViewHostImpl::OnRequestDesktopNotificationPermission(