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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/devtools/devtools_agent.cc

Issue 12150004: Category group support/Renamings. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased, fixed last nit. Created 7 years, 9 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_unittest.cc ('K') | « content/public/browser/trace_subscriber.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/devtools/devtools_agent.cc
diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc
index 868f5ec47bac65c81f8e2df8bfabafeb97187760..c88bd404f01b3b7d86790f3ab161a39687c0b189 100644
--- a/content/renderer/devtools/devtools_agent.cc
+++ b/content/renderer/devtools/devtools_agent.cc
@@ -135,7 +135,13 @@ void DevToolsAgent::clearBrowserCookies() {
void DevToolsAgent::setTraceEventCallback(TraceEventCallback cb) {
TraceLog* trace_log = TraceLog::GetInstance();
trace_log->SetEventCallback(cb);
- trace_log->SetEnabled(!!cb, TraceLog::RECORD_UNTIL_FULL);
+ if (!!cb) {
+ trace_log->SetEnabled(base::debug::CategoryFilter(
+ base::debug::CategoryFilter::kDefaultCategoryFilterString),
+ TraceLog::RECORD_UNTIL_FULL);
+ } else {
+ trace_log->SetDisabled();
+ }
}
#if defined(USE_TCMALLOC) && !defined(OS_WIN)
« base/debug/trace_event_unittest.cc ('K') | « content/public/browser/trace_subscriber.h ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698