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

Unified Diff: base/android/base_jni_registrar.cc

Issue 1180693002: Update from https://crrev.com/333737 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 6 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 | « base/android/application_status_listener.cc ('k') | base/android/build_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/base_jni_registrar.cc
diff --git a/base/android/base_jni_registrar.cc b/base/android/base_jni_registrar.cc
index 43ba635847690aac3b2505efcecbd492732334fb..752dcff19c438588fc2b92139a2424cce0967897 100644
--- a/base/android/base_jni_registrar.cc
+++ b/base/android/base_jni_registrar.cc
@@ -5,6 +5,7 @@
#include "base/android/base_jni_registrar.h"
#include "base/android/animation_frame_time_histogram.h"
+#include "base/android/apk_assets.h"
#include "base/android/application_status_listener.h"
#include "base/android/build_info.h"
#include "base/android/command_line_android.h"
@@ -38,6 +39,8 @@ namespace android {
static RegistrationMethod kBaseRegisteredMethods[] = {
{"AnimationFrameTimeHistogram",
base::android::RegisterAnimationFrameTimeHistogram},
+ {"ApkAssets",
+ base::android::RegisterApkAssets},
{"ApplicationStatusListener",
base::android::ApplicationStatusListener::RegisterBindings},
{"BuildInfo", base::android::BuildInfo::RegisterBindings},
« no previous file with comments | « base/android/application_status_listener.cc ('k') | base/android/build_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698