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

Unified Diff: chrome/android/testshell/chrome_main_delegate_testshell_android.cc

Issue 10968003: Add rendering support to the TestShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased on top of test apk changes. Created 8 years, 3 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: chrome/android/testshell/chrome_main_delegate_testshell_android.cc
diff --git a/chrome/android/testshell/chrome_main_delegate_testshell_android.cc b/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
index e334afc557f91afa9a39cd714328cc5b9d29e7b4..25d6623462b70d0c1490cd390ecd5186a164bfb7 100644
--- a/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
+++ b/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
@@ -5,6 +5,12 @@
#include "chrome/android/testshell/chrome_main_delegate_testshell_android.h"
#include "base/android/jni_android.h"
+#include "base/android/jni_registrar.h"
+#include "chrome/android/testshell/tab_manager.h"
+
+static base::android::RegistrationMethod kRegistrationMethods[] = {
+ { "TabManager", chrome::RegisterTabManager },
+};
ChromeMainDelegateTestShellAndroid::ChromeMainDelegateTestShellAndroid() {
}
@@ -14,5 +20,10 @@ ChromeMainDelegateTestShellAndroid::~ChromeMainDelegateTestShellAndroid() {
bool ChromeMainDelegateTestShellAndroid::RegisterApplicationNativeMethods(
JNIEnv* env) {
- return ChromeMainDelegateAndroid::RegisterApplicationNativeMethods(env);
+ if (!ChromeMainDelegateAndroid::RegisterApplicationNativeMethods(env))
+ return false;
+
+ return base::android::RegisterNativeMethods(env,
+ kRegistrationMethods,
+ arraysize(kRegistrationMethods));
}

Powered by Google App Engine
This is Rietveld 408576698