content/browser/browser_main_runner.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/browser_main_runner.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/background_sync/background_sync_manager.cc ('K') | « content/browser/browser_main_loop.cc ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | content/browser/web_contents/web_contents_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_runner.cc

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

index b19fc6950ba1162569f63bee28d6cbea40e36850..63200ca760e4d1b235b7c61a97e850ddcfeece4a 100644

--- a/content/browser/browser_main_runner.cc

+++ b/content/browser/browser_main_runner.cc

@@ -264,7 +264,7 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {

} else if (tracing::TraceConfigFile::GetInstance()->IsEnabled() &&

TracingController::GetInstance()->IsRecording()) {

base::FilePath result_file;

-#if defined(OS_ANDROID)

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

mfomitchev 2015/11/03 22:23:20 @sievers: Do you know off the top of your head if

no sievers 2015/11/04 01:59:32 I think it's only for startup and shutdown tracing

TracingControllerAndroid::GenerateTracingFilePath(&result_file);

#else

result_file = tracing::TraceConfigFile::GetInstance()->GetResultFile();