content/browser/devtools/render_frame_devtools_agent_host.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/devtools/render_frame_devtools_agent_host.cc

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

Patch Set: Getting rid of BrowserStartupController changes Created 5 years, 2 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

« content/browser/BUILD.gn ('K') | « content/browser/compositor/surface_utils.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/render_frame_devtools_agent_host.cc

diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc

index 95597dd68dce0d68776594f8271ba7ae41f34db7..a274517170bc2ae759d775f312d3612ad9ed927a 100644

--- a/content/browser/devtools/render_frame_devtools_agent_host.cc

+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc

@@ -436,7 +436,7 @@ void RenderFrameDevToolsAgentHost::OnClientAttached() {

frame_trace_recorder_.reset(new DevToolsFrameTraceRecorder());

-#if defined(OS_ANDROID)

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

power_save_blocker_.reset(static_cast<PowerSaveBlockerImpl*>(

PowerSaveBlocker::Create(

PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,

« content/browser/BUILD.gn ('K') | « content/browser/compositor/surface_utils.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame.h » ('j') | no next file with comments »