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

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

Issue 946643002: Use PowerSaveBlocker for audio and video on Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: apply nits Created 5 years, 10 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
« no previous file with comments | « content/browser/power_save_blocker_x11.cc ('k') | content/public/browser/power_save_blocker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ed679224852e6b4631a4335b32c695015be47e3e..16ea91ec037086d3ab001b1ea44d1cf2073707dd 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3161,26 +3161,22 @@ void WebContentsImpl::OnUpdateFaviconURL(
}
void WebContentsImpl::CreateAudioPowerSaveBlocker() {
- // ChromeOS has its own way of handling power save blocks for media.
-#if !defined(OS_CHROMEOS)
DCHECK(!audio_power_save_blocker_);
audio_power_save_blocker_ = PowerSaveBlocker::Create(
- PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension, "Playing Audio");
-#endif
+ PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension,
+ PowerSaveBlocker::kReasonAudioPlayback, "Playing audio");
}
void WebContentsImpl::CreateVideoPowerSaveBlocker() {
- // ChromeOS has its own way of handling power save blocks for media.
-#if !defined(OS_CHROMEOS)
DCHECK(!video_power_save_blocker_);
DCHECK(!active_video_players_.empty());
video_power_save_blocker_ = PowerSaveBlocker::Create(
- PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, "Playing Video");
+ PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
+ PowerSaveBlocker::kReasonVideoPlayback, "Playing video");
#if defined(OS_ANDROID)
static_cast<PowerSaveBlockerImpl*>(video_power_save_blocker_.get())
->InitDisplaySleepBlocker(GetView()->GetNativeView());
#endif
-#endif
}
void WebContentsImpl::MaybeReleasePowerSaveBlockers() {
« no previous file with comments | « content/browser/power_save_blocker_x11.cc ('k') | content/public/browser/power_save_blocker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698