content/browser/tracing/background_tracing_manager_impl.h - Issue 1148633007: Hooked the trace event argument whitelist up to the background_trace_manager

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 1148633007: Hooked the trace event argument whitelist up to the background_trace_manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Buildfix Created 5 years, 6 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/tracing/background_tracing_manager_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 979562984a01149ea9bb95f0258590a1c73483fd..0ce73f96e664ce1268ebdedc657fb56ef48c6cce 100644

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

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

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

bool SetActiveScenario(scoped_ptr<BackgroundTracingConfig>,

const ReceiveCallback&,

- bool) override;

+ DataFiltering data_filtering) override;

void WhenIdle(IdleCallback idle_callback) override;

void TriggerNamedEvent(TriggerHandle, StartedFinalizingCallback) override;

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

void GetTriggerNameList(std::vector<std::string>* trigger_names) override;

void InvalidateTriggerHandlesForTesting() override;

+ void SetTracingEnabledCallbackForTesting(

+ const base::Closure& callback) override;

void FireTimerForTesting() override;

private:

@@ -94,6 +95,7 @@ class BackgroundTracingManagerImpl : public content::BackgroundTracingManager {

int trigger_handle_ids_;

IdleCallback idle_callback_;

+ base::Closure tracing_enabled_callback_for_testing_;

friend struct base::DefaultLazyInstanceTraits<BackgroundTracingManagerImpl>;