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

Unified Diff: content/browser/android/tracing_controller_android.cc

Issue 26358012: Use CategoryFilter::kDefaultCategoryFilterString instead of "*" as the default category (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DEFAULT_CHROME_CATEGORIES Created 7 years, 2 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
Index: content/browser/android/tracing_controller_android.cc
diff --git a/content/browser/android/tracing_controller_android.cc b/content/browser/android/tracing_controller_android.cc
index d2fd74f0962558d0ace69346a395be5e01abf82c..cfa540daff5ad7c10d6db78dfca5bba55dfb8054 100644
--- a/content/browser/android/tracing_controller_android.cc
+++ b/content/browser/android/tracing_controller_android.cc
@@ -7,6 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/command_line.h"
+#include "base/debug/trace_event.h"
#include "base/files/file_path.h"
#include "base/logging.h"
#include "content/browser/tracing/trace_subscriber_stdio.h"
@@ -90,6 +91,11 @@ void TracingControllerAndroid::OnTracingStopped() {
subscriber_.reset();
}
+static jstring GetDefaultCategories(JNIEnv* env, jobject obj) {
+ return base::android::ConvertUTF8ToJavaString(env,
+ base::debug::CategoryFilter::kDefaultCategoryFilterString).Release();
+}
+
bool RegisterTracingControllerAndroid(JNIEnv* env) {
return RegisterNativesImpl(env);
}

Powered by Google App Engine
This is Rietveld 408576698