content/browser/tracing/background_tracing_manager_impl.h - Issue 1165673002: [Startup Tracing] Hook up TraceConfig and remove CategoryFilter & TraceOptions

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/background_tracing_manager_impl.h

Issue 1165673002: [Startup Tracing] Hook up TraceConfig and remove CategoryFilter & TraceOptions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 7 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/media/webrtc_getusermedia_browsertest.cc ('k') | content/browser/tracing/background_tracing_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tracing/background_tracing_manager_impl.h

diff --git a/content/browser/tracing/background_tracing_manager_impl.h b/content/browser/tracing/background_tracing_manager_impl.h

index fd1fd00ad9e4fe147d0861e37c1327448ab6b53b..ddca7ba8eec695111c7405e9fcd9217705c7cc49 100644

--- a/content/browser/tracing/background_tracing_manager_impl.h

+++ b/content/browser/tracing/background_tracing_manager_impl.h

@@ -34,7 +34,7 @@ class BackgroundTracingManagerImpl : public content::BackgroundTracingManager {

BackgroundTracingManagerImpl();

~BackgroundTracingManagerImpl() override;

- void EnableRecording(base::trace_event::CategoryFilter);

+ void EnableRecording(std::string category_filter_str);

void EnableRecordingIfConfigNeedsIt();

void OnFinalizeStarted(scoped_refptr<base::RefCountedString>);

void OnFinalizeComplete();

@@ -46,7 +46,7 @@ class BackgroundTracingManagerImpl : public content::BackgroundTracingManager {

bool IsAbleToTriggerTracing(TriggerHandle handle) const;

bool IsSupportedConfig(BackgroundTracingConfig* config);

- base::trace_event::CategoryFilter GetCategoryFilterForCategoryPreset(

+ std::string GetCategoryFilterStringForCategoryPreset(

BackgroundTracingConfig::CategoryPreset) const;

class TraceDataEndpointWrapper