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

Unified Diff: base/android/base_jni_registrar.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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: base/android/base_jni_registrar.cc
diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc
index 7439d3c5a2b24c0424977b627ce620e28a22b381..43ba635847690aac3b2505efcecbd492732334fb 100644
--- a/base/android/base_jni_registrar.cc
+++ b/base/android/base_jni_registrar.cc
@@ -14,6 +14,7 @@
#include "base/android/field_trial_list.h"
#include "base/android/important_file_writer_android.h"
#include "base/android/java_handler_thread.h"
+#include "base/android/java_runtime.h"
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
#include "base/android/jni_utils.h"
@@ -22,6 +23,7 @@
#include "base/android/path_service_android.h"
#include "base/android/path_utils.h"
#include "base/android/record_histogram.h"
+#include "base/android/record_user_action.h"
#include "base/android/sys_utils.h"
#include "base/android/thread_utils.h"
#include "base/android/trace_event_binding.h"
@@ -55,6 +57,8 @@ static RegistrationMethod kBaseRegisteredMethods[] = {
{"PathUtils", base::android::RegisterPathUtils},
{"PowerMonitor", base::RegisterPowerMonitor},
{"RecordHistogram", base::android::RegisterRecordHistogram},
+ {"RecordUserAction", base::android::RegisterRecordUserAction},
+ {"Runtime", base::android::JavaRuntime::Register},
{"SystemMessageHandler", base::MessagePumpForUI::RegisterBindings},
{"SysUtils", base::android::SysUtils::Register},
{"ThreadUtils", base::RegisterThreadUtils},
« no previous file with comments | « base/OWNERS ('k') | base/android/build_info.h » ('j') | mojo/public/tools/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698