summaryrefslogtreecommitdiffstats
path: root/chrome/app/android
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/app/android')
-rw-r--r--chrome/app/android/chrome_main_delegate_android.cc13
1 files changed, 12 insertions, 1 deletions
diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/android/chrome_main_delegate_android.cc
index f0b6d4f..bf28f4a 100644
--- a/chrome/app/android/chrome_main_delegate_android.cc
+++ b/chrome/app/android/chrome_main_delegate_android.cc
@@ -5,13 +5,19 @@
#include "chrome/app/android/chrome_main_delegate_android.h"
#include "base/android/jni_android.h"
+#include "base/android/jni_registrar.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "chrome/browser/android/chrome_jni_registrar.h"
#include "chrome/browser/android/chrome_startup_flags.h"
+#include "chrome/browser/android/tab_base_android_impl.h"
#include "chrome/common/chrome_switches.h"
#include "content/public/browser/browser_main_runner.h"
+static base::android::RegistrationMethod kRegistrationMethods[] = {
+ { "TabBaseAndroidImpl", TabBaseAndroidImpl::RegisterTabBaseAndroidImpl },
+};
+
// ChromeMainDelegateAndroid is created when the library is loaded. It is always
// done in the process's main Java thread. But for non browser process, e.g.
// renderer process, it is not the native Chrome's main thread.
@@ -51,5 +57,10 @@ bool ChromeMainDelegateAndroid::BasicStartupComplete(int* exit_code) {
}
bool ChromeMainDelegateAndroid::RegisterApplicationNativeMethods(JNIEnv* env) {
- return chrome::android::RegisterJni(env);
+ if (!chrome::android::RegisterJni(env))
+ return false;
+
+ return base::android::RegisterNativeMethods(env,
+ kRegistrationMethods,
+ arraysize(kRegistrationMethods));
}