Sending generated vote on password generation.

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 102 matching lines @@
     : form(password_form),
       password_elements(passwords) {}
 
 PasswordGenerationAgent::AccountCreationFormData::~AccountCreationFormData() {}
 
 PasswordGenerationAgent::PasswordGenerationAgent(
     content::RenderFrame* render_frame,
     PasswordAutofillAgent* password_agent)
     : content::RenderFrameObserver(render_frame),
       password_is_generated_(false),
+      is_manually_triggered_(false),
       password_edited_(false),
       generation_popup_shown_(false),
       editing_popup_shown_(false),
       enabled_(password_generation::IsPasswordGenerationEnabled()),
       password_agent_(password_agent) {
   VLOG(2) << "Password Generation is " << (enabled_ ? "Enabled" : "Disabled");
 }
 PasswordGenerationAgent::~PasswordGenerationAgent() {}
 
 void PasswordGenerationAgent::DidFinishDocumentLoad() {
@@ skipping 113 matching lines @@
 
 bool PasswordGenerationAgent::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PasswordGenerationAgent, message)
     IPC_MESSAGE_HANDLER(AutofillMsg_FormNotBlacklisted,
                         OnFormNotBlacklisted)
     IPC_MESSAGE_HANDLER(AutofillMsg_GeneratedPasswordAccepted,
                         OnPasswordAccepted)
     IPC_MESSAGE_HANDLER(AutofillMsg_FoundFormsEligibleForGeneration,
                         OnFormsEligibleForGenerationFound);
-    IPC_MESSAGE_HANDLER(AutofillMsg_GeneratePassword, OnGeneratePassword);
+    IPC_MESSAGE_HANDLER(AutofillMsg_UserTriggeredGeneratePassword,
+                        OnUserTriggeredGeneratePassword);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void PasswordGenerationAgent::OnFormNotBlacklisted(const PasswordForm& form) {
   not_blacklisted_password_form_origins_.push_back(form.origin);
   DetermineGenerationElement();
 }
 
@@ skipping 164 matching lines @@
     // characters typed, so keep offering the password. Note this function
     // will just keep the previous popup if one is already showing.
     ShowGenerationPopup();
   }
 
   return true;
 }
 
 void PasswordGenerationAgent::ShowGenerationPopup() {
   Send(new AutofillHostMsg_ShowPasswordGenerationPopup(
-           routing_id(),
-           render_frame()->GetRenderView()->ElementBoundsInWindow(
-               generation_element_),
-           generation_element_.maxLength(),
-           *generation_form_data_->form));
+      routing_id(),
+      render_frame()->GetRenderView()->ElementBoundsInWindow(
+          generation_element_),
+      generation_element_.maxLength(),
+      generation_element_.nameForAutofill(),
+      is_manually_triggered_,
+      *generation_form_data_->form));
   generation_popup_shown_ = true;
 }
 
 void PasswordGenerationAgent::ShowEditingPopup() {
   Send(new AutofillHostMsg_ShowPasswordEditingPopup(
            routing_id(),
            render_frame()->GetRenderView()->ElementBoundsInWindow(
                generation_element_),
            *generation_form_data_->form));
   editing_popup_shown_ = true;
 }
 
 void PasswordGenerationAgent::HidePopup() {
   Send(new AutofillHostMsg_HidePasswordGenerationPopup(routing_id()));
 }
 
-void PasswordGenerationAgent::OnGeneratePassword() {
+void PasswordGenerationAgent::OnUserTriggeredGeneratePassword() {
   blink::WebDocument doc = render_frame()->GetWebFrame()->document();
   if (doc.isNull())
     return;
 
   blink::WebElement focused_element = doc.focusedElement();
   const blink::WebInputElement* element = toWebInputElement(&focused_element);
   if (!element || !element->isPasswordField())
     return;
 
   blink::WebFormElement form = element->form();
   if (form.isNull())
     return;
 
   scoped_ptr<PasswordForm> password_form(
       CreatePasswordFormFromWebForm(form, nullptr, nullptr));
   if (!password_form)
     return;
 
   generation_element_ = *element;
   std::vector<blink::WebInputElement> password_elements;
   GetAccountCreationPasswordFields(form, &password_elements);
   password_elements = FindPasswordElementsForGeneration(
       password_elements, element->nameForAutofill());
   generation_form_data_.reset(new AccountCreationFormData(
       make_linked_ptr(password_form.release()), password_elements));
+  is_manually_triggered_ = true;
   ShowGenerationPopup();
 }
 
 }  // namespace autofill