content/browser/wake_lock/wake_lock_service_context.cc - Issue 1411503005: 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/wake_lock/wake_lock_service_context.cc

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

Patch Set: Addressing remaining feedback, cleaning up build files. Created 5 years, 1 month 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

« content/browser/browser_main_runner.cc ('K') | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | content/browser/web_contents/web_contents_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/wake_lock/wake_lock_service_context.cc

diff --git a/content/browser/wake_lock/wake_lock_service_context.cc b/content/browser/wake_lock/wake_lock_service_context.cc

index 582ea58d5169a6e57706820edfa8fe58077902da..8143dc4e24feba9e428cdc5bc141390db022828b 100644

--- a/content/browser/wake_lock/wake_lock_service_context.cc

+++ b/content/browser/wake_lock/wake_lock_service_context.cc

@@ -62,7 +62,8 @@ void WakeLockServiceContext::CreateWakeLock() {

PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

PowerSaveBlocker::kReasonOther, "Wake Lock API");

-#if defined(OS_ANDROID)

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

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

// On Android, additionaly associate the blocker with this WebContents.

DCHECK(web_contents());