[Password Generation] Update UI to match final mocks.

chrome/browser/password_manager/password_generation_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/password_manager/password_generation_manager.h"
 
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/password_manager/password_manager_delegate.h"
 #include "chrome/browser/password_manager/password_manager_driver.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 107 matching lines @@
 #if defined(USE_AURA)
   // Convert element_bounds to be in screen space.
   gfx::RectF element_bounds_in_screen_space = GetBoundsInScreenSpace(bounds);
 
   password_generator_.reset(new autofill::PasswordGenerator(max_length));
 
   popup_controller_ =
       autofill::PasswordGenerationPopupControllerImpl::GetOrCreate(
           popup_controller_,
           element_bounds_in_screen_space,
-          form,
+          &form,
           password_generator_.get(),
           driver_->GetPasswordManager(),
           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.
+  // 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,
+          NULL,
+          NULL,
+          NULL,
+          observer_,
+          web_contents_,
+          web_contents_->GetView()->GetNativeView());
+  popup_controller_->Show(false /* display_password */);
+#endif  // #if defined(USE_AURA)
 }
 
 void PasswordGenerationManager::OnHidePasswordGenerationPopup() {
   HidePopup();
 }
 
 void PasswordGenerationManager::HidePopup() {
   if (popup_controller_)
     popup_controller_->HideAndDestroy();
 }