diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-12 23:04:31 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-12 23:04:31 +0000 |
| commit | 434a1326361f04e671c0f998a60b20bab85ebaa7 (patch) | |
| tree | cef45711481cadbeea31b12a505763d75ee93c54 /chrome/browser/android/chrome_jni_registrar.cc | |
| parent | 50fc3337ba7a6f22f903d8c4235afdddb535f911 (diff) | |
| download | chromium_src-434a1326361f04e671c0f998a60b20bab85ebaa7.zip chromium_src-434a1326361f04e671c0f998a60b20bab85ebaa7.tar.gz chromium_src-434a1326361f04e671c0f998a60b20bab85ebaa7.tar.bz2 | |
Move content/components/web_contents_delegate_android to components/web_contents_delegate_android
Moving files, change namespace from content to components,
added/updated DEPS files, and fix builds
BUG=169312
Review URL: https://chromiumcodereview.appspot.com/11823046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/android/chrome_jni_registrar.cc')
| -rw-r--r-- | chrome/browser/android/chrome_jni_registrar.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc index 70547bf..a55a797 100644 --- a/chrome/browser/android/chrome_jni_registrar.cc +++ b/chrome/browser/android/chrome_jni_registrar.cc @@ -17,14 +17,18 @@ #include "chrome/browser/ui/android/chrome_http_auth_handler.h" #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" #include "chrome/browser/ui/android/navigation_popup.h" +#include "components/web_contents_delegate_android/component_jni_registrar.h" #include "content/components/navigation_interception/component_jni_registrar.h" -#include "content/components/web_contents_delegate_android/color_chooser_android.h" -#include "content/components/web_contents_delegate_android/component_jni_registrar.h" namespace chrome { namespace android { static base::android::RegistrationMethod kChromeRegisteredMethods[] = { + // Register JNI for components we depend on. + { "NavigationInterception", content::RegisterNavigationInterceptionJni }, + { "WebContentsDelegateAndroid", + components::RegisterWebContentsDelegateAndroidJni }, + // Register JNI for chrome classes. { "AutofillPopup", AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid}, { "ChromeBrowserProvider", @@ -33,7 +37,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, { "ChromeWebContentsDelegateAndroid", RegisterChromeWebContentsDelegateAndroid }, - { "ColorChooserAndroid", content::RegisterColorChooserAndroid }, { "ContentViewUtil", RegisterContentViewUtil }, { "DevToolsServer", RegisterDevToolsServer }, { "IntentHelper", RegisterIntentHelper }, @@ -42,11 +45,9 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = { { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, { "ProcessUtils", RegisterProcessUtils }, { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, - { "navigation_interception", content::RegisterNavigationInterceptionJni }, }; bool RegisterJni(JNIEnv* env) { - content::RegisterWebContentsDelegateAndroidJni(env); return RegisterNativeMethods(env, kChromeRegisteredMethods, arraysize(kChromeRegisteredMethods)); } |