content/browser/media/media_web_contents_observer.cc - Issue 1649483002: Revert of Aura on Android: content/browser

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/media_web_contents_observer.cc

Issue 1649483002: Revert of Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file

Patch Set: Merging android_non_aura_browser_sources into android_browser_sources rather than private_browser_s… Created 4 years, 11 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/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/power_save_blocker_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/media_web_contents_observer.cc

diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc

index 67ef0368680e8d6be542d65dd5b9f43a857ffd01..283e4d46a195520c27979288c806d06a52626e40 100644

--- a/content/browser/media/media_web_contents_observer.cc

+++ b/content/browser/media/media_web_contents_observer.cc

@@ -154,8 +154,7 @@ void MediaWebContentsObserver::CreateVideoPowerSaveBlocker() {

video_power_save_blocker_ = PowerSaveBlocker::Create(

PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

PowerSaveBlocker::kReasonVideoPlayback, "Playing video");

-// TODO(mfomitchev): Support PowerSaveBlocker on Aura - crbug.com/546718.

-#if defined(OS_ANDROID) && !defined(USE_AURA)

+#if defined(OS_ANDROID)

static_cast<PowerSaveBlockerImpl*>(video_power_save_blocker_.get())

->InitDisplaySleepBlocker(web_contents());

#endif

« no previous file with comments | « content/browser/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/power_save_blocker_impl.cc » ('j') | no next file with comments »