Allow deleting autofill password suggestions on Shift+Delete

components/autofill/core/browser/autofill_external_delegate.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/core/browser/autofill_external_delegate.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "grit/component_strings.h"
 #include "third_party/WebKit/public/web/WebAutofillClient.h"
+#include "third_party/WebKit/public/web/WebFormControlElement.h"
+#include "third_party/WebKit/public/web/WebFormElement.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using blink::WebAutofillClient;
 
 namespace autofill {
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     AutofillManager* autofill_manager,
     AutofillDriver* autofill_driver)
     : autofill_manager_(autofill_manager),
       autofill_driver_(autofill_driver),
       password_autofill_manager_(autofill_driver),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
       has_autofill_suggestion_(false),
       has_shown_autofill_popup_for_current_edit_(false),
       weak_ptr_factory_(this) {
   DCHECK(autofill_manager);
 }
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {}
 
 void AutofillExternalDelegate::OnQuery(int query_id,
                                        const FormData& form,
                                        const FormFieldData& field,
+                                       const blink::WebFormElement& element,
                                        const gfx::RectF& element_bounds,
                                        bool display_warning_if_disabled) {
   autofill_query_form_ = form;
   autofill_query_field_ = field;
+  web_form_element_ = element;
   display_warning_if_disabled_ = display_warning_if_disabled;
   autofill_query_id_ = query_id;
   element_bounds_ = element_bounds;
 }
 
 void AutofillExternalDelegate::OnSuggestionsReturned(
     int query_id,
     const std::vector<base::string16>& autofill_values,
     const std::vector<base::string16>& autofill_labels,
     const std::vector<base::string16>& autofill_icons,
@@ skipping 52 matching lines @@
   if (autofill_query_field_.is_focusable) {
     autofill_manager_->delegate()->ShowAutofillPopup(
         element_bounds_,
         autofill_query_field_.text_direction,
         values,
         labels,
         icons,
         ids,
         GetWeakPtr());
   }
-}
+}OnShowPasswordSuggestions

[vabr (Chromium), 2014/01/10 18:40:00]

This looks misplaced. Please delete "OnShowPasswordSuggestions" or repair
otherwise.

(BTW., did this compile?)

 
 void AutofillExternalDelegate::OnShowPasswordSuggestions(
     const std::vector<base::string16>& suggestions,
     const std::vector<base::string16>& realms,
     const FormFieldData& field,
+    const blink::WebFormElement& element,
     const gfx::RectF& element_bounds) {
   autofill_query_field_ = field;
+  web_form_element_ = element;
   element_bounds_ = element_bounds;
 
   if (suggestions.empty()) {
     autofill_manager_->delegate()->HideAutofillPopup();
     return;
   }
 
   std::vector<base::string16> empty(suggestions.size());
   std::vector<int> password_ids(suggestions.size(),
                                 WebAutofillClient::MenuItemIDPasswordEntry);
@@ skipping 61 matching lines @@
     FillAutofillFormData(identifier, false);
   }
 
   autofill_manager_->delegate()->HideAutofillPopup();
 }
 
 void AutofillExternalDelegate::RemoveSuggestion(const base::string16& value,
                                                 int identifier) {
   if (identifier > 0) {
     autofill_manager_->RemoveAutofillProfileOrCreditCard(identifier);
+  } else if (identifier == WebAutofillClient::MenuItemIDPasswordEntry) {
+    bool success = password_autofill_manager_.RemovePasswordSuggestion(
+        autofill_query_field_,
+        web_form_element_);
+    DCHECK(success);
   } else {
     autofill_manager_->RemoveAutocompleteEntry(autofill_query_field_.name,
                                                value);
   }
 }
 
 void AutofillExternalDelegate::DidEndTextFieldEditing() {
   autofill_manager_->delegate()->HideAutofillPopup();
 
   has_shown_autofill_popup_for_current_edit_ = false;
@@ skipping 136 matching lines @@
   // Set the values that all datalist elements share.
   autofill_icons->insert(autofill_icons->begin(),
                          data_list_values_.size(),
                          base::string16());
   autofill_unique_ids->insert(autofill_unique_ids->begin(),
                               data_list_values_.size(),
                               WebAutofillClient::MenuItemIDDataListEntry);
 }
 
 }  // namespace autofill