Save password without an associated username.

chrome/renderer/autofill/password_autofill_manager.cc

 // Copyright (c) 2012 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/renderer/autofill/password_autofill_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/common/autofill_messages.h"
@@ skipping 177 matching lines @@
 }
 
 bool DoUsernamesMatch(const string16& username1,
                       const string16& username2,
                       bool exact_match) {
   if (exact_match)
     return username1 == username2;
   return StartsWith(username1, username2, true);
 }
 
+// Get whether fill_data has a username or not.

[Ilya Sherman, 2012/04/19 00:27:37]

nit: Wording suggestion: """Returns true iff the |fill_data| includes a username
field."""

+bool HasUsernameField(const webkit::forms::PasswordFormFillData& fill_data) {
+  return fill_data.basic_data.fields.size() == 2;
+}
+
+// Get the username field from fill_data.

[Ilya Sherman, 2012/04/19 00:27:37]

nit: Wording suggestion: "Returns the username field from the |fill_data|.  The
caller is responsible for checking that this field exists prior to calling this
function."

+// If it hasn't any username, calls NOTREACHED().

[Ilya Sherman, 2012/04/19 00:27:37]

nit: Please omit this line -- it's redundant with the code (and is indeed a bit
out of sync, since the code now instead has a DCHECK()).

+const webkit::forms::FormField& GetUsernameField(
+  const webkit::forms::PasswordFormFillData& fill_data) {
+  DCHECK(HasUsernameField(fill_data));
+  return fill_data.basic_data.fields[1];
+}
+
+// Get the password field from fill_data.

[Ilya Sherman, 2012/04/19 00:27:37]

nit: Wording suggestion: "Returns the password field from |fill_data|."

+const webkit::forms::FormField& GetPasswordField(
+  const webkit::forms::PasswordFormFillData& fill_data) {
+  DCHECK(!fill_data.basic_data.fields.empty());
+  return fill_data.basic_data.fields[0];
+}
 }  // namespace
 
 namespace autofill {
 
 ////////////////////////////////////////////////////////////////////////////////
 // PasswordAutofillManager, public:
 
 PasswordAutofillManager::PasswordAutofillManager(
     content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
@@ skipping 232 matching lines @@
   FindFormElements(render_view()->GetWebView(), form_data.basic_data, &forms);
   FormElementsList::iterator iter;
   for (iter = forms.begin(); iter != forms.end(); ++iter) {
     scoped_ptr<FormElements> form_elements(*iter);
 
     // If wait_for_username is true, we don't want to initially fill the form
     // until the user types in a valid username.
     if (!form_data.wait_for_username)
       FillForm(form_elements.get(), form_data.basic_data);
 
+    // If there isn't any username, go to next iteration.

[Ilya Sherman, 2012/04/19 00:27:37]

nit: This comment is redundant with the code.  Instead, I'd suggest something
like "If the form does not have a username field, it doesn't make sense to wait
for the username to be filled."

+    if (!HasUsernameField(form_data))
+      continue;
+
+    // If there is a username, set the username and login_to_password_info_.
     // Attach autocomplete listener to enable selecting alternate logins.
     // First, get pointers to username element.
     WebKit::WebInputElement username_element =
-        form_elements->input_elements[form_data.basic_data.fields[0].name];
+        form_elements->input_elements[GetUsernameField(form_data).name];
 
     // Get pointer to password element. (We currently only support single
     // password forms).
     WebKit::WebInputElement password_element =
-        form_elements->input_elements[form_data.basic_data.fields[1].name];
+        form_elements->input_elements[GetPasswordField(form_data).name];
 
     // We might have already filled this form if there are two <form> elements
     // with identical markup.
     if (login_to_password_info_.find(username_element) !=
         login_to_password_info_.end())
       continue;
 
     PasswordInfo password_info;
     password_info.fill_data = form_data;
     password_info.password_field = password_element;
@@ skipping 10 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PasswordAutofillManager, private:
 
 void PasswordAutofillManager::GetSuggestions(
     const webkit::forms::PasswordFormFillData& fill_data,
     const string16& input,
     std::vector<string16>* suggestions) {
-  if (StartsWith(fill_data.basic_data.fields[0].value, input, false))
-    suggestions->push_back(fill_data.basic_data.fields[0].value);
+  // There are both a password and a username.

[Ilya Sherman, 2012/04/19 00:27:37]

nit: Please move this comment into the if-stmt, right above line 516 in the
current patch set, since it only describes what happens if the if-stmt's
condition passes.

+  if (HasUsernameField(fill_data) &&
+      StartsWith(GetUsernameField(fill_data).value, input, false)) {
+    suggestions->push_back(GetUsernameField(fill_data).value);
+  }
 
   webkit::forms::PasswordFormFillData::LoginCollection::const_iterator iter;
   for (iter = fill_data.additional_logins.begin();
        iter != fill_data.additional_logins.end(); ++iter) {
     if (StartsWith(iter->first, input, false))
       suggestions->push_back(iter->first);
   }
 }
 
 bool PasswordAutofillManager::ShowSuggestionPopup(
@@ skipping 43 matching lines @@
     WebKit::WebInputElement* username_element,
     WebKit::WebInputElement* password_element,
     const webkit::forms::PasswordFormFillData& fill_data,
     bool exact_username_match,
     bool set_selection) {
   string16 current_username = username_element->value();
   // username and password will contain the match found if any.
   string16 username;
   string16 password;
 
+  // If there isn't any username form, just exit.
+  // Because this function is used for the case
+  // that the username form and the possword form exist.

[Ilya Sherman, 2012/04/19 00:27:37]

nit: Wording suggestion: """If there is no username field, there are no
suggestions that make sense to show in the popup."""

+  if (!HasUsernameField(fill_data))
+    return false;
+
   // Look for any suitable matches to current field text.
-  if (DoUsernamesMatch(fill_data.basic_data.fields[0].value, current_username,
+  if (DoUsernamesMatch(GetUsernameField(fill_data).value, current_username,
                        exact_username_match)) {
-    username = fill_data.basic_data.fields[0].value;
-    password = fill_data.basic_data.fields[1].value;
+    username = GetUsernameField(fill_data).value;
+    password = GetPasswordField(fill_data).value;
   } else {
     // Scan additional logins for a match.
     webkit::forms::PasswordFormFillData::LoginCollection::const_iterator iter;
     for (iter = fill_data.additional_logins.begin();
          iter != fill_data.additional_logins.end(); ++iter) {
       if (DoUsernamesMatch(iter->first, current_username,
                            exact_username_match)) {
         username = iter->first;
         password = iter->second;
         break;
@@ skipping 67 matching lines @@
   LoginToPasswordInfoMap::iterator iter = login_to_password_info_.find(input);
   if (iter == login_to_password_info_.end())
     return false;
 
   *found_input = input;
   *found_password = iter->second;
   return true;
 }
 
 }  // namespace autofill