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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 478543003: Use AudioStreamMonitor to control power save blocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile. Created 6 years, 4 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
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 350f586d8dcd797d337b9559cf1ffad54f483f21..d6c3c3c216cb04a0c28df0aeb55ed6f2cc0e77c2 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3004,15 +3004,15 @@ void WebContentsImpl::OnUpdateFaviconURL(
void WebContentsImpl::OnMediaPlayingNotification(int64 player_cookie,
bool has_video,
bool has_audio) {
-#if !defined(OS_CHROMEOS)
+ // Power save blocking is controlled by the tab audio indicator on desktop
+ // platforms.
+#if !defined(OS_CHROMEOS) && defined(OS_ANDROID)
scoped_ptr<PowerSaveBlocker> blocker;
if (has_video) {
blocker = PowerSaveBlocker::Create(
PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, "Playing video");
scherkus (not reviewing) 2014/08/21 21:42:55 FYI this is prevent display sleep
-#if defined(OS_ANDROID)
static_cast<PowerSaveBlockerImpl*>(blocker.get())
->InitDisplaySleepBlocker(GetView()->GetNativeView());
-#endif
} else if (has_audio) {
blocker = PowerSaveBlocker::Create(
PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension, "Playing audio");
scherkus (not reviewing) 2014/08/21 21:42:55 FYI this is the audio-only branch which only preve
miu 2014/08/25 19:34:52 note: It should be perfectly safe to have multiple
« chrome/browser/media/audio_stream_monitor.cc ('K') | « chrome/browser/media/audio_stream_monitor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698