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

Unified Diff: content/browser/trace_controller_impl.cc

Issue 10855062: Allow use of the chrome trace categories string from the tracing ui internals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update DEPS for trace-viewer changes. Created 8 years, 4 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/trace_controller_impl.h ('k') | content/public/browser/trace_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/trace_controller_impl.cc
diff --git a/content/browser/trace_controller_impl.cc b/content/browser/trace_controller_impl.cc
index 0c5d5cdfbb5a9598e1ce963956dcaa23578f3d5b..91640fcb97a5db826d4927e4daf7cb8ac8266236 100644
--- a/content/browser/trace_controller_impl.cc
+++ b/content/browser/trace_controller_impl.cc
@@ -109,18 +109,12 @@ bool TraceControllerImpl::GetKnownCategoriesAsync(TraceSubscriber* subscriber) {
// message. So to get known categories, just begin and end tracing immediately
// afterwards. This will ping all the child processes for categories.
is_get_categories_ = true;
- bool success = BeginTracing(subscriber) && EndTracingAsync(subscriber);
+ bool success = BeginTracing(subscriber, "*") &&
+ EndTracingAsync(subscriber);
is_get_categories_ = success;
return success;
}
-bool TraceControllerImpl::BeginTracing(TraceSubscriber* subscriber) {
- std::vector<std::string> include, exclude;
- // By default, exclude all categories that begin with test_
- exclude.push_back("test_*");
- return BeginTracing(subscriber, include, exclude);
-}
-
bool TraceControllerImpl::BeginTracing(
TraceSubscriber* subscriber,
const std::vector<std::string>& included_categories,
« no previous file with comments | « content/browser/trace_controller_impl.h ('k') | content/public/browser/trace_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698