Remove manual JNI registration functions from android/compositor
JNI method registration is now automatic. This change removes manual
registration methods in android/compositor.
BUG=740208
Change-Id: I18ac4a41b60fe0c347eeedd379b370affc826a38
Reviewed-on: https://chromium-review.googlesource.com/563826
Commit-Queue: Matthew Jones <mdjones@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487112}diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc
index 8d2d390..3dd2e1b 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -21,16 +21,6 @@
#include "chrome/browser/android/chrome_application.h"
#include "chrome/browser/android/chrome_backup_agent.h"
#include "chrome/browser/android/chrome_feature_list.h"
-#include "chrome/browser/android/compositor/compositor_view.h"
-#include "chrome/browser/android/compositor/layer_title_cache.h"
-#include "chrome/browser/android/compositor/resources/resource_factory.h"
-#include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h"
-#include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
-#include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h"
-#include "chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h"
-#include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h"
-#include "chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.h"
-#include "chrome/browser/android/compositor/tab_content_manager.h"
#include "chrome/browser/android/contextualsearch/contextual_search_context.h"
#include "chrome/browser/android/contextualsearch/contextual_search_manager.h"
#include "chrome/browser/android/contextualsearch/contextual_search_ranker_logger_impl.h"
@@ -197,7 +187,6 @@
media_router::MediaRouterDialogControllerAndroid::Register},
{"ChromePayments", payments::android::RegisterChromePayments},
{"ChromeWebApkHost", ChromeWebApkHost::Register},
- {"CompositorView", RegisterCompositorView},
{"SecurityStateModel", RegisterSecurityStateModelAndroid},
{"ConnectivityChecker", chrome::android::RegisterConnectivityChecker},
{"ContentSuggestionsNotificationHelper",
@@ -206,7 +195,6 @@
{"ContextualSearchManager", RegisterContextualSearchManager},
{"ContextualSearchRankerLoggerImpl",
RegisterContextualSearchRankerLoggerImpl},
- {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer},
{"ContextualSearchTabHelper", RegisterContextualSearchTabHelper},
{"CookiesFetcher", RegisterCookiesFetcher},
{"CtrSuppression", RegisterCtrSuppression},
@@ -247,7 +235,6 @@
invalidation::InvalidationServiceFactoryAndroid::Register},
{"LargeIconBridge", LargeIconBridge::RegisterLargeIconBridge},
{"LaunchMetrics", metrics::RegisterLaunchMetrics},
- {"LayerTitleCache", RegisterLayerTitleCache},
{"LoadingPredictor", predictors::RegisterLoadingPredictor},
{"LocaleManager", RegisterLocaleManager},
{"LocationSettingsImpl", LocationSettingsImpl::Register},
@@ -296,11 +283,9 @@
{"RecordCastAction", remote_media::RegisterRecordCastAction},
{"RemoteMediaPlayerBridge",
remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge},
- {"ResourceFactory", RegisterResourceFactory},
{"RevenueStats", chrome::android::RegisterRevenueStats},
{"RlzPingHandler", chrome::android::RegisterRlzPingHandler},
{"SafeBrowsing", safe_browsing::android::RegisterBrowserJNI},
- {"SceneLayer", RegisterSceneLayer},
{"ScreenshotTask", chrome::android::RegisterScreenshotTask},
{"ServiceTabLauncher", ServiceTabLauncher::Register},
{"SearchGeolocationDisclosureTabHelper",
@@ -317,20 +302,15 @@
#endif
{"SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
{"StartupMetricUtils", chrome::android::RegisterStartupMetricUtils},
- {"StaticTabSceneLayer", RegisterStaticTabSceneLayer},
{"SuggestionsEventReporterBridge", RegisterSuggestionsEventReporterBridge},
{"SupervisedUserContentProvider", SupervisedUserContentProvider::Register},
{"Sync", syncer::RegisterSyncJni},
{"SyncSessionsMetrics", SyncSessionsMetricsAndroid::Register},
{"TabAndroid", TabAndroid::RegisterTabAndroid},
- {"TabContentManager", RegisterTabContentManager},
- {"TabListSceneLayer", RegisterTabListSceneLayer},
{"TabState", RegisterTabState},
- {"TabStripSceneLayer", RegisterTabStripSceneLayer},
{"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid},
{"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register},
{"ThumbnailProvider", ThumbnailProvider::RegisterThumbnailProvider},
- {"ToolbarSceneLayer", RegisterToolbarSceneLayer},
{"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
{"UmaSessionStats", RegisterUmaSessionStats},
{"UrlFilterBridge", UrlFilterBridge::Register},
diff --git a/chrome/browser/android/compositor/compositor_view.cc b/chrome/browser/android/compositor/compositor_view.cc
index 51019ae..a529608 100644
--- a/chrome/browser/android/compositor/compositor_view.cc
+++ b/chrome/browser/android/compositor/compositor_view.cc
@@ -270,9 +270,4 @@
// through here but through BrowserChildProcessHostDisconnected() instead.
}
-// Register native methods
-bool RegisterCompositorView(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
} // namespace android
diff --git a/chrome/browser/android/compositor/compositor_view.h b/chrome/browser/android/compositor/compositor_view.h
index 7f45f4a1..90a8ecc 100644
--- a/chrome/browser/android/compositor/compositor_view.h
+++ b/chrome/browser/android/compositor/compositor_view.h
@@ -117,8 +117,6 @@
DISALLOW_COPY_AND_ASSIGN(CompositorView);
};
-bool RegisterCompositorView(JNIEnv* env);
-
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_COMPOSITOR_VIEW_H_
diff --git a/chrome/browser/android/compositor/layer_title_cache.cc b/chrome/browser/android/compositor/layer_title_cache.cc
index 0e0cdb1..ecb9203 100644
--- a/chrome/browser/android/compositor/layer_title_cache.cc
+++ b/chrome/browser/android/compositor/layer_title_cache.cc
@@ -121,10 +121,6 @@
LayerTitleCache::~LayerTitleCache() {
}
-bool RegisterLayerTitleCache(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
// ----------------------------------------------------------------------------
// Native JNI methods
// ----------------------------------------------------------------------------
diff --git a/chrome/browser/android/compositor/layer_title_cache.h b/chrome/browser/android/compositor/layer_title_cache.h
index 98d0f755..79f5ff1 100644
--- a/chrome/browser/android/compositor/layer_title_cache.h
+++ b/chrome/browser/android/compositor/layer_title_cache.h
@@ -88,8 +88,6 @@
DISALLOW_COPY_AND_ASSIGN(LayerTitleCache);
};
-bool RegisterLayerTitleCache(JNIEnv* env);
-
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TITLE_CACHE_H_
diff --git a/chrome/browser/android/compositor/resources/resource_factory.cc b/chrome/browser/android/compositor/resources/resource_factory.cc
index f721430..d64f838c 100644
--- a/chrome/browser/android/compositor/resources/resource_factory.cc
+++ b/chrome/browser/android/compositor/resources/resource_factory.cc
@@ -11,10 +11,6 @@
namespace android {
-bool RegisterResourceFactory(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
jlong CreateToolbarContainerResource(JNIEnv* env,
const JavaParamRef<jclass>& clazz,
jint toolbar_left,
diff --git a/chrome/browser/android/compositor/resources/resource_factory.h b/chrome/browser/android/compositor/resources/resource_factory.h
index 37f5c40..b0d5d002 100644
--- a/chrome/browser/android/compositor/resources/resource_factory.h
+++ b/chrome/browser/android/compositor/resources/resource_factory.h
@@ -6,11 +6,23 @@
#define CHROME_BROWSER_ANDROID_COMPOSITOR_RESOURCES_RESOURCE_FACTORY_H_
#include "base/android/jni_android.h"
+#include "jni/ResourceFactory_jni.h"
+
+using base::android::JavaParamRef;
namespace android {
-bool RegisterResourceFactory(JNIEnv* env);
-
+jlong CreateToolbarContainerResource(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz,
+ jint toolbar_left,
+ jint toolbar_top,
+ jint toolbar_right,
+ jint toolbar_bottom,
+ jint location_bar_left,
+ jint location_bar_top,
+ jint location_bar_right,
+ jint location_bar_bottom,
+ jint shadow_height);
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_RESOURCES_RESOURCE_FACTORY_H_
diff --git a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
index 2c51567e..b8e7d665 100644
--- a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
@@ -250,8 +250,4 @@
return reinterpret_cast<intptr_t>(tree_provider);
}
-bool RegisterContextualSearchSceneLayer(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h
index 4c156ef..ea43098 100644
--- a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h
@@ -134,8 +134,6 @@
DISALLOW_COPY_AND_ASSIGN(ContextualSearchSceneLayer);
};
-bool RegisterContextualSearchSceneLayer(JNIEnv* env);
-
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE_LAYER_H_
diff --git a/chrome/browser/android/compositor/scene_layer/scene_layer.cc b/chrome/browser/android/compositor/scene_layer/scene_layer.cc
index 82fd267b..cadfd3a 100644
--- a/chrome/browser/android/compositor/scene_layer/scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/scene_layer.cc
@@ -62,8 +62,4 @@
return reinterpret_cast<intptr_t>(tree_provider);
}
-bool RegisterSceneLayer(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/scene_layer.h b/chrome/browser/android/compositor/scene_layer/scene_layer.h
index 9ce8100c..fd9f520 100644
--- a/chrome/browser/android/compositor/scene_layer/scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/scene_layer.h
@@ -55,8 +55,6 @@
DISALLOW_COPY_AND_ASSIGN(SceneLayer);
};
-bool RegisterSceneLayer(JNIEnv* env);
-
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_SCENE_LAYER_H_
diff --git a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.cc
index 948126e..781f3ec 100644
--- a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.cc
@@ -88,8 +88,4 @@
return reinterpret_cast<intptr_t>(scene_layer);
}
-bool RegisterStaticTabSceneLayer(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
index e8495f1..50c56a4 100644
--- a/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h
@@ -62,8 +62,6 @@
DISALLOW_COPY_AND_ASSIGN(StaticTabSceneLayer);
};
-bool RegisterStaticTabSceneLayer(JNIEnv* env);
-
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_STATIC_TAB_SCENE_LAYER_H_
diff --git a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc
index cc6b906..8f27be0 100644
--- a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc
@@ -211,8 +211,4 @@
return reinterpret_cast<intptr_t>(scene_layer);
}
-bool RegisterTabListSceneLayer(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h
index c062d83..8ccdd8a 100644
--- a/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h
@@ -133,8 +133,6 @@
DISALLOW_COPY_AND_ASSIGN(TabListSceneLayer);
};
-bool RegisterTabListSceneLayer(JNIEnv* env);
-
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_TAB_LIST_SCENE_LAYER_H_
diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc
index c0914fc..c968e7d 100644
--- a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc
@@ -331,8 +331,4 @@
return reinterpret_cast<intptr_t>(scene_layer);
}
-bool RegisterTabStripSceneLayer(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h
index 4119c10..f0e7ed48 100644
--- a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h
@@ -136,8 +136,6 @@
DISALLOW_COPY_AND_ASSIGN(TabStripSceneLayer);
};
-bool RegisterTabStripSceneLayer(JNIEnv* env);
-
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_TAB_STRIP_SCENE_LAYER_H_
diff --git a/chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.cc
index ea8b28e..660d0f2 100644
--- a/chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.cc
@@ -120,8 +120,4 @@
return reinterpret_cast<intptr_t>(toolbar_scene_layer);
}
-bool RegisterToolbarSceneLayer(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
} // namespace android
diff --git a/chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.h b/chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.h
index cc0b0f6..ee01279 100644
--- a/chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.h
+++ b/chrome/browser/android/compositor/scene_layer/toolbar_scene_layer.h
@@ -76,8 +76,6 @@
DISALLOW_COPY_AND_ASSIGN(ToolbarSceneLayer);
};
-bool RegisterToolbarSceneLayer(JNIEnv* env);
-
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_TOOLBAR_SCENE_LAYER_H_
diff --git a/chrome/browser/android/compositor/tab_content_manager.cc b/chrome/browser/android/compositor/tab_content_manager.cc
index 2b8a1b0..31998c2c 100644
--- a/chrome/browser/android/compositor/tab_content_manager.cc
+++ b/chrome/browser/android/compositor/tab_content_manager.cc
@@ -338,10 +338,6 @@
thumbnail_cache_->Put(tab_id, bitmap, thumbnail_scale);
}
-bool RegisterTabContentManager(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
// ----------------------------------------------------------------------------
// Native JNI methods
// ----------------------------------------------------------------------------
diff --git a/chrome/browser/android/compositor/tab_content_manager.h b/chrome/browser/android/compositor/tab_content_manager.h
index 0a6a0fd..c1a39fd 100644
--- a/chrome/browser/android/compositor/tab_content_manager.h
+++ b/chrome/browser/android/compositor/tab_content_manager.h
@@ -128,8 +128,6 @@
DISALLOW_COPY_AND_ASSIGN(TabContentManager);
};
-bool RegisterTabContentManager(JNIEnv* env);
-
} // namespace android
#endif // CHROME_BROWSER_ANDROID_COMPOSITOR_TAB_CONTENT_MANAGER_H_
