content/browser/tracing/trace_message_filter.cc - Issue 12150004: Category group support/Renamings.

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/tracing/trace_message_filter.cc

Issue 12150004: Category group support/Renamings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fixed comment, added better support for default filtering, fixed merge issues. Created 7 years, 9 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:

Index: content/browser/tracing/trace_message_filter.cc

diff --git a/content/browser/tracing/trace_message_filter.cc b/content/browser/tracing/trace_message_filter.cc

index 8894cff5a33079966c6cfabf8fe1f371cbbed23b..e75d786142d90307958bba370a3456efc0f52e66 100644

--- a/content/browser/tracing/trace_message_filter.cc

+++ b/content/browser/tracing/trace_message_filter.cc

@@ -55,11 +55,10 @@ bool TraceMessageFilter::OnMessageReceived(const IPC::Message& message,

}

void TraceMessageFilter::SendBeginTracing(

- const std::vector<std::string>& included_categories,

- const std::vector<std::string>& excluded_categories,

+ const std::string& category_filter_str,

base::debug::TraceLog::Options options) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- Send(new TracingMsg_BeginTracing(included_categories, excluded_categories,

+ Send(new TracingMsg_BeginTracing(category_filter_str,

base::TimeTicks::NowFromSystemTraceTime(),

options));

}