Index: chrome/browser/ui/android/autofill/password_generation_popup_view_android.cc |
diff --git a/chrome/browser/ui/android/autofill/password_generation_popup_view_android.cc b/chrome/browser/ui/android/autofill/password_generation_popup_view_android.cc |
index a0f48c64dd42dbb5412ee65323d26e9fada2def1..80098004e801011191a384d95887d5a6ef1ac218 100644 |
--- a/chrome/browser/ui/android/autofill/password_generation_popup_view_android.cc |
+++ b/chrome/browser/ui/android/autofill/password_generation_popup_view_android.cc |
@@ -61,10 +61,13 @@ void PasswordGenerationPopupViewAndroid::Show() { |
DCHECK(view_android); |
+ popup_ = view_android->AcquireAnchorView(); |
+ if (popup_.is_null()) |
+ return; |
java_object_.Reset(Java_PasswordGenerationPopupBridge_create( |
- env, reinterpret_cast<intptr_t>(this), |
- view_android->GetWindowAndroid()->GetJavaObject().obj(), |
- view_android->GetViewAndroidDelegate().obj())); |
+ env, popup_.view().obj(), controller_->element_bounds().width(), |
+ reinterpret_cast<intptr_t>(this), |
+ view_android->GetWindowAndroid()->GetJavaObject().obj())); |
UpdateBoundsAndRedrawPopup(); |
} |
@@ -82,14 +85,10 @@ gfx::Size PasswordGenerationPopupViewAndroid::GetPreferredSizeOfPasswordView() { |
void PasswordGenerationPopupViewAndroid::UpdateBoundsAndRedrawPopup() { |
JNIEnv* env = base::android::AttachCurrentThread(); |
- Java_PasswordGenerationPopupBridge_setAnchorRect( |
- env, |
- java_object_.obj(), |
- controller_->element_bounds().x(), |
- controller_->element_bounds().y(), |
- controller_->element_bounds().width(), |
- controller_->element_bounds().height()); |
+ ui::ViewAndroid* view_android = controller_->container_view(); |
+ DCHECK(view_android); |
+ view_android->SetAnchorRect(popup_.view(), controller_->element_bounds()); |
ScopedJavaLocalRef<jstring> password = |
base::android::ConvertUTF16ToJavaString(env, controller_->password()); |
ScopedJavaLocalRef<jstring> suggestion = |