Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1330)

Unified Diff: content/browser/tracing/tracing_ui.cc

Issue 1066903002: Roll trace-viewer deps to the latest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update trace-viewer DEPS to fix license problem Created 5 years, 8 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 | « DEPS ('k') | tools/telemetry/telemetry/value/trace.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tracing/tracing_ui.cc
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc
index 66ae8e8fe4ac6fcaa20feca8ba768d5526a3fc85..58fbb753116c1811a58e9c88f2a19255349e75ab 100644
--- a/content/browser/tracing/tracing_ui.cc
+++ b/content/browser/tracing/tracing_ui.cc
@@ -86,20 +86,16 @@ bool GetTracingOptions(const std::string& data64,
options_ok &= options->GetString("categoryFilter", &category_filter_string);
*category_filter = base::trace_event::CategoryFilter(category_filter_string);
+ std::string record_mode;
+ options_ok &=
+ options->GetString("tracingRecordMode", &record_mode);
+ options_ok &= tracing_options->SetFromString(record_mode);
+
options_ok &= options->GetBoolean("useSystemTracing",
&tracing_options->enable_systrace);
options_ok &=
options->GetBoolean("useSampling", &tracing_options->enable_sampling);
- bool use_continuous_tracing;
- options_ok &=
- options->GetBoolean("useContinuousTracing", &use_continuous_tracing);
-
- if (use_continuous_tracing)
- tracing_options->record_mode = base::trace_event::RECORD_CONTINUOUSLY;
- else
- tracing_options->record_mode = base::trace_event::RECORD_UNTIL_FULL;
-
if (!options_ok) {
LOG(ERROR) << "Malformed options";
return false;
« no previous file with comments | « DEPS ('k') | tools/telemetry/telemetry/value/trace.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698