| Index: chrome/browser/password_manager/password_generation_manager.cc
|
| diff --git a/chrome/browser/password_manager/password_generation_manager.cc b/chrome/browser/password_manager/password_generation_manager.cc
|
| index fcb7a27fb27fa8748746644071f19e1df7a7c101..d1e764110e3c6960daab67340f0261f23d9eff39 100644
|
| --- a/chrome/browser/password_manager/password_generation_manager.cc
|
| +++ b/chrome/browser/password_manager/password_generation_manager.cc
|
| @@ -114,13 +114,29 @@ void PasswordGenerationManager::OnShowPasswordGenerationPopup(
|
| observer_,
|
| web_contents_,
|
| web_contents_->GetView()->GetNativeView());
|
| - popup_controller_->Show();
|
| + popup_controller_->Show(true /* display_password */);
|
| #endif // #if defined(USE_AURA)
|
| }
|
|
|
| void PasswordGenerationManager::OnShowPasswordEditingPopup(
|
| - const gfx::RectF& bounds) {
|
| - // TODO(gcasto): Enable this.
|
| + const gfx::RectF& bounds,
|
| + const autofill::PasswordForm& form) {
|
| + // Only implemented for Aura right now.
|
| +#if defined(USE_AURA)
|
| + gfx::RectF element_bounds_in_screen_space = GetBoundsInScreenSpace(bounds);
|
| +
|
| + popup_controller_ =
|
| + autofill::PasswordGenerationPopupControllerImpl::GetOrCreate(
|
| + popup_controller_,
|
| + element_bounds_in_screen_space,
|
| + form,
|
| + password_generator_.get(),
|
| + driver_->GetPasswordManager(),
|
| + observer_,
|
| + web_contents_,
|
| + web_contents_->GetView()->GetNativeView());
|
| + popup_controller_->Show(false /* display_password */);
|
| +#endif // #if defined(USE_AURA)
|
| }
|
|
|
| void PasswordGenerationManager::OnHidePasswordGenerationPopup() {
|
|
|