content/browser/browser_main_loop.cc - Issue 874543003: Add support for TraceEvent before the native library is loaded.

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/browser_main_loop.cc

Issue 874543003: Add support for TraceEvent before the native library is loaded. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Selectively enable startup tracing in ChromeShell. Created 5 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

« chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java ('K') | « content/browser/android/tracing_controller_android.cc ('k') | content/browser/tracing/tracing_controller_impl.h » ('j') | content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 64e3446bcce54b75ed116e3820d246929c916dcc..7ae752cbf2113b6c847eba701f9b368dbfb55550 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -1232,6 +1232,10 @@ void BrowserMainLoop::InitStartupTracing(

delay_secs = 5;

}

+#if defined(OS_ANDROID)

+ TracingControllerAndroid::SetupEarlyJavaTracing();

+#endif

startup_trace_timer_.Start(FROM_HERE,

base::TimeDelta::FromSeconds(delay_secs),

this,

@@ -1240,6 +1244,7 @@ void BrowserMainLoop::InitStartupTracing(

void BrowserMainLoop::EndStartupTracing() {

is_tracing_startup_ = false;

TracingController::GetInstance()->DisableRecording(

TracingController::CreateFileSink(

startup_trace_file_,