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

Unified Diff: content/browser/android/content_video_view.cc

Issue 606633002: [WebView] Create PowerSaveBlocker for fullscreen video. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: alphabetize Created 6 years, 3 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 | « android_webview/lib/main/aw_main_delegate.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/content_video_view.cc
diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc
index 82f496670b9f7d8e8d3e617d055ea1558db992c8..342a140e3ce3f0e0647676df2fb12a438ed3878b 100644
--- a/content/browser/android/content_video_view.cc
+++ b/content/browser/android/content_video_view.cc
@@ -262,18 +262,19 @@ JavaObjectWeakGlobalRef ContentVideoView::CreateJavaObject() {
}
void ContentVideoView::CreatePowerSaveBlocker() {
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableOverlayFullscreenVideoSubtitle)) {
- return;
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableContentVideoViewPowerSaveBlocker)) {
+ // In fullscreen Clank reuses the power save blocker attached to the
+ // container view that was created for embedded video. The WebView cannot
+ // reuse that so we create a new blocker instead.
+ if (power_save_blocker_) return;
+
+ power_save_blocker_ = PowerSaveBlocker::Create(
+ PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
+ "Playing video").Pass();
+ static_cast<PowerSaveBlockerImpl*>(power_save_blocker_.get())->
+ InitDisplaySleepBlocker(GetNativeView());
}
-
- if (power_save_blocker_) return;
-
- power_save_blocker_ = PowerSaveBlocker::Create(
- PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
- "Playing video").Pass();
- static_cast<PowerSaveBlockerImpl*>(power_save_blocker_.get())->
- InitDisplaySleepBlocker(GetNativeView());
}
} // namespace content
« no previous file with comments | « android_webview/lib/main/aw_main_delegate.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698