Move content/components/web_contents_delegate_android to components/web_contents_delegate_android

chrome/browser/android/chrome_jni_registrar.cc

Index: chrome/browser/android/chrome_jni_registrar.cc
diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index 70547bfbc10f23efcbf5926b19384f579b6918b2..28fb53df83dddba2020b89193ac2b98a31514b97 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -17,14 +17,20 @@
 #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/color_chooser_android.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.

[boliu, 2013/01/10 20:20:22]

Please review this. I reordered the registrars are called.

+  { "color_chooser_android", components::RegisterColorChooserAndroid },

[Jói, 2013/01/10 21:17:13]

This was "ColorChooserAndroid" before the change, not "color_chooser_android".
Intentional?

[boliu, 2013/01/10 21:40:25]

Yes, I don't think those names are used except in logging. I followed the style
in the registrar file in aw/

[Yaron, 2013/01/10 21:56:40]

If color_chooser is part of WCDA, it should be registered as part of WCDA's
registrar. Why is it separate here? It also looks like webview doesn't register
it yet.. is there an API that hasn't been implemented yet?

[boliu, 2013/01/10 22:02:13]

ColorChooser was added and never used, and I agree it should be in its own
component. So...I could remove it here?

CL it was added: https://chromiumcodereview.appspot.com/11316153

[joth, 2013/01/10 22:21:53]

yah Hooking it up in aw/ is covered by http://b/7621527


I don't really know the motivation on the first param or if anyone finds them
useful these days, but I think the general convention is to use the ClassName
version. (you got unlucky in the  ones  you copied style from aw/, most of them
are camel case)


.. my brain does beg for us to use a macro to make these table definitions a bit
clearer :)

[boliu, 2013/01/10 22:35:38]

Ok, I was a bit confused. Native WebContentsDelegatesAndroid creates the
ColorChooser, which creates the java side, so they should be in the same
component. Will move the register function to where it should be.

Joth: Does this mean webview will crash and burn with <input type=color>? I'll
try adding it to aw and see if it still compiles.
I can make them all camel case.

+  { "navigation_interception", content::RegisterNavigationInterceptionJni },
+  { "web_contents_delegate_android",

[Jói, 2013/01/10 21:17:13]

This did not appear in the list previously.  Intentional?

[boliu, 2013/01/10 21:40:25]

Yes, this is from the first line in RegisterJni that's removed.

+      components::RegisterWebContentsDelegateAndroidJni },
+  // Register JNI for chrome classes.
   { "AutofillPopup",
       AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid},
   { "ChromeBrowserProvider",
@@ -33,7 +39,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
       ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler },
   { "ChromeWebContentsDelegateAndroid",
       RegisterChromeWebContentsDelegateAndroid },
-  { "ColorChooserAndroid", content::RegisterColorChooserAndroid },
   { "ContentViewUtil", RegisterContentViewUtil },
   { "DevToolsServer", RegisterDevToolsServer },
   { "IntentHelper", RegisterIntentHelper },
@@ -42,11 +47,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));
 }