content/browser/browser_main_loop.cc - Issue 541763002: tracing: get rid of files in TracingController interface

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 541763002: tracing: get rid of files in TracingController interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed android Created 6 years, 3 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/android/tracing_controller_android.cc ('k') | content/browser/devtools/devtools_tracing_handler.h » ('j') | content/browser/tracing/tracing_controller_impl.cc » ('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 5c5b3fea25fc1bf736384ee516b3c7c3fed3c902..0bc949d7942cf14c05c4406670917ff471c6f7ff 100644

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

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

@@ -7,7 +7,6 @@

#include "base/bind.h"

#include "base/command_line.h"

#include "base/debug/trace_event.h"

-#include "base/file_util.h"

#include "base/logging.h"

#include "base/message_loop/message_loop.h"

#include "base/metrics/field_trial.h"

@@ -42,13 +41,13 @@

#include "content/browser/speech/speech_recognition_manager_impl.h"

#include "content/browser/startup_task_runner.h"

#include "content/browser/time_zone_monitor.h"

+#include "content/browser/tracing/tracing_controller_impl.h"

#include "content/browser/webui/content_web_ui_controller_factory.h"

#include "content/browser/webui/url_data_manager.h"

#include "content/public/browser/browser_main_parts.h"

#include "content/public/browser/browser_shutdown.h"

#include "content/public/browser/content_browser_client.h"

#include "content/public/browser/render_process_host.h"

-#include "content/public/browser/tracing_controller.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/main_function_params.h"

#include "content/public/common/result_codes.h"

@@ -1195,7 +1194,8 @@ void BrowserMainLoop::InitStartupTracing(

void BrowserMainLoop::EndStartupTracing() {

is_tracing_startup_ = false;

TracingController::GetInstance()->DisableRecording(

- startup_trace_file_, base::Bind(&OnStoppedStartupTracing));

+ TracingControllerImpl::CreateFileSink(startup_trace_file_,

+ base::Bind(OnStoppedStartupTracing, startup_trace_file_)));

}

} // namespace content