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

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 1317333002: Reland [Startup Tracing] Add --trace-config-file flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unit test Created 5 years, 4 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/plugin_process_host.cc ('k') | mandoline/app/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 48665d5df8a519c1efcbd85b77f3e9b1fb05006d..0a8a297318db47406e2eebaff78c1aacf56e7c60 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1349,6 +1349,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kTestType,
switches::kTouchEvents,
switches::kTouchTextSelectionStrategy,
+ switches::kTraceConfigFile,
switches::kTraceToConsole,
// This flag needs to be propagated to the renderer process for
// --in-process-webgl.
@@ -1418,7 +1419,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
arraysize(kSwitchNames));
if (browser_cmd.HasSwitch(switches::kTraceStartup) &&
- BrowserMainLoop::GetInstance()->is_tracing_startup()) {
+ BrowserMainLoop::GetInstance()->is_tracing_startup_for_duration()) {
// Pass kTraceStartup switch to renderer only if startup tracing has not
// finished.
renderer_cmd->AppendSwitchASCII(
« no previous file with comments | « content/browser/plugin_process_host.cc ('k') | mandoline/app/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698