[Password Generation] Update UI to match final mocks.

components/autofill/content/renderer/password_generation_agent.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 "components/autofill/content/renderer/password_generation_agent.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/autofill/content/common/autofill_messages.h"
@@ skipping 264 matching lines @@
     return;
   }
 
   DVLOG(2) << "Password generation eligible form found";
   generation_element_ = password_elements_[0];
   password_generation::LogPasswordGenerationEvent(
       password_generation::GENERATION_AVAILABLE);
 }
 
 void PasswordGenerationAgent::FocusedNodeChanged(const blink::WebNode& node) {
-  // TODO(gcasto): Re-hide generation_element text.
+  if (!generation_element_.isNull())
+    generation_element_.setShouldRevealPassword(false);
+
   if (node.isNull() || !node.isElementNode())
     return;
 
   const blink::WebElement web_element = node.toConst<blink::WebElement>();
   if (!web_element.document().frame())
     return;
 
   const blink::WebInputElement* element = toWebInputElement(&web_element);
   if (!element || *element != generation_element_)
     return;
 
   if (password_is_generated_) {
-    // TODO(gcasto): Make characters visible.
+    generation_element_.setShouldRevealPassword(true);
     ShowEditingPopup();
   }
 
   // Only trigger if the password field is empty.
   if (!element->isReadOnly() &&
       element->isEnabled() &&
       element->value().isEmpty()) {
     ShowGenerationPopup();
   }
 }
 
 bool PasswordGenerationAgent::TextDidChangeInTextField(
     const blink::WebInputElement& element) {
   if (element != generation_element_)
     return false;
 
   if (element.value().isEmpty()) {
     if (password_is_generated_) {
       // User generated a password and then deleted it.
       password_generation::LogPasswordGenerationEvent(
           password_generation::PASSWORD_DELETED);
     }
 
+    // Do not treat the password as generated.
     // TODO(gcasto): Set PasswordForm::type in the browser to TYPE_NORMAL.
     password_is_generated_ = false;
+    generation_element_.setShouldRevealPassword(false);
+
     // Offer generation again.
     ShowGenerationPopup();
   } else if (!password_is_generated_) {
     // User has rejected the feature and has started typing a password.
     HidePopup();
   } else {
     password_edited_ = true;
     // Mirror edits to any confirmation password fields.
     for (std::vector<blink::WebInputElement>::iterator it =
              password_elements_.begin();
@@ skipping 18 matching lines @@
 
   password_generation::LogPasswordGenerationEvent(
       password_generation::GENERATION_POPUP_SHOWN);
 }
 
 void PasswordGenerationAgent::ShowEditingPopup() {
   gfx::RectF bounding_box_scaled =
       GetScaledBoundingBox(render_view_->GetWebView()->pageScaleFactor(),
                            &generation_element_);
 
-  Send(new AutofillHostMsg_ShowPasswordEditingPopup(routing_id(),
-                                                    bounding_box_scaled));
+  Send(new AutofillHostMsg_ShowPasswordEditingPopup(
+      routing_id(),
+      bounding_box_scaled,
+      *possible_account_creation_form_));
 
   password_generation::LogPasswordGenerationEvent(
       password_generation::EDITING_POPUP_SHOWN);
 }
 
 void PasswordGenerationAgent::HidePopup() {
   Send(new AutofillHostMsg_HidePasswordGenerationPopup(routing_id()));
 }
 
 }  // namespace autofill