content/browser/devtools/devtools_tracing_handler.h - Issue 425593002: Refactor trace_event_impl's SetEnabled to use TraceOptions. Propagate this through the whole stack.

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/devtools/devtools_tracing_handler.h

Issue 425593002: Refactor trace_event_impl's SetEnabled to use TraceOptions. Propagate this through the whole stack. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address Nat and Dan's comments. Use CategoryFilter for tracing_controller.h's APIs Created 6 years, 5 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

« base/debug/trace_event_impl.h ('K') | « content/browser/android/tracing_controller_android.cc ('k') | content/browser/devtools/devtools_tracing_handler.cc » ('j') | content/browser/tracing/trace_message_filter.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/devtools_tracing_handler.h

diff --git a/content/browser/devtools/devtools_tracing_handler.h b/content/browser/devtools/devtools_tracing_handler.h

index cd162c60182c044653abda6e916ef7f7d4613038..989965ee574c43c265f8b306fc738032a88fc086 100644

--- a/content/browser/devtools/devtools_tracing_handler.h

+++ b/content/browser/devtools/devtools_tracing_handler.h

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

#include <set>

#include <string>

+#include "base/debug/trace_event.h"

#include "base/memory/weak_ptr.h"

#include "content/browser/devtools/devtools_protocol.h"

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

@@ -46,7 +47,7 @@ class DevToolsTracingHandler : public DevToolsProtocol::Handler {

void OnCategoriesReceived(scoped_refptr<DevToolsProtocol::Command> command,

const std::set<std::string>& category_set);

- TracingController::Options TraceOptionsFromString(const std::string& options);

+ base::debug::TraceOptions TraceOptionsFromString(const std::string& options);

void DisableRecording(

const TracingController::TracingFileResultCallback& callback =