| Index: chrome/browser/android/chrome_web_contents_delegate_android.cc
|
| diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc
|
| index a7de6d71995e9979c9647a7ff38f45febca37e0f..5957c4b6211501d3373c397704cf2cb9cc69a3c7 100644
|
| --- a/chrome/browser/android/chrome_web_contents_delegate_android.cc
|
| +++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc
|
| @@ -22,6 +22,7 @@
|
|
|
| using base::android::AttachCurrentThread;
|
| using base::android::GetClass;
|
| +using base::android::MethodID;
|
| using base::android::ScopedJavaLocalRef;
|
| using content::FileChooserParams;
|
| using content::WebContents;
|
| @@ -140,8 +141,8 @@ void ChromeWebContentsDelegateAndroid::OnFindResultAvailable(
|
| ScopedJavaLocalRef<jclass> rect_clazz =
|
| GetClass(env, "android/graphics/Rect");
|
|
|
| - jmethodID rect_constructor =
|
| - GetMethodID(env, rect_clazz, "<init>", "(IIII)V");
|
| + jmethodID rect_constructor = MethodID::Get<MethodID::METHODTYPE_NORMAL>(
|
| + env, rect_clazz.obj(), "<init>", "(IIII)V");
|
|
|
| ScopedJavaLocalRef<jobject> selection_rect = CreateAndroidRect(
|
| env, rect_clazz, rect_constructor, find_result->selection_rect());
|
| @@ -150,8 +151,8 @@ void ChromeWebContentsDelegateAndroid::OnFindResultAvailable(
|
| ScopedJavaLocalRef<jclass> details_clazz =
|
| GetClass(env, "org/chromium/chrome/browser/FindNotificationDetails");
|
|
|
| - jmethodID details_constructor = GetMethodID(env, details_clazz, "<init>",
|
| - "(ILandroid/graphics/Rect;IZ)V");
|
| + jmethodID details_constructor = MethodID::Get<MethodID::METHODTYPE_NORMAL>(
|
| + env, details_clazz.obj(), "<init>", "(ILandroid/graphics/Rect;IZ)V");
|
|
|
| ScopedJavaLocalRef<jobject> details_object(
|
| env,
|
| @@ -189,8 +190,8 @@ void ChromeWebContentsDelegateAndroid::FindMatchRectsReply(
|
| ScopedJavaLocalRef<jclass> rect_clazz =
|
| GetClass(env, "android/graphics/RectF");
|
|
|
| - jmethodID rect_constructor =
|
| - GetMethodID(env, rect_clazz, "<init>", "(FFFF)V");
|
| + jmethodID rect_constructor = MethodID::Get<MethodID::METHODTYPE_NORMAL>(
|
| + env, rect_clazz.obj(), "<init>", "(FFFF)V");
|
|
|
| ScopedJavaLocalRef<jobjectArray> jrects(env, env->NewObjectArray(
|
| match_rects.rects().size(), rect_clazz.obj(), NULL));
|
| @@ -211,7 +212,8 @@ void ChromeWebContentsDelegateAndroid::FindMatchRectsReply(
|
| ScopedJavaLocalRef<jclass> details_clazz =
|
| GetClass(env, "org/chromium/chrome/browser/FindMatchRectsDetails");
|
|
|
| - jmethodID details_constructor = GetMethodID(env, details_clazz, "<init>",
|
| + jmethodID details_constructor = MethodID::Get<MethodID::METHODTYPE_NORMAL>(
|
| + env, details_clazz.obj(), "<init>",
|
| "(I[Landroid/graphics/RectF;Landroid/graphics/RectF;)V");
|
|
|
| ScopedJavaLocalRef<jobject> details_object(
|
|
|