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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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/compositor/gpu_process_transport_factory.cc ('K') | « content/browser/compositor/surface_utils.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame.h » ('j') | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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)
no sievers 2015/10/22 20:55:40 TODO(crbug.com/546718)
mfomitchev 2015/11/02 21:51:15 Done.
power_save_blocker_.reset(static_cast<PowerSaveBlockerImpl*>(
PowerSaveBlocker::Create(
PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
« content/browser/compositor/gpu_process_transport_factory.cc ('K') | « content/browser/compositor/surface_utils.cc ('k') | content/browser/frame_host/render_widget_host_view_child_frame.h » ('j') | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698