Add Delete Support to New Autofill UI

chrome/browser/autofill/autofill_external_delegate.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 "base/utf_string_conversions.h"
+#include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::RenderViewHost;
 
 namespace {
-
-// The value to give as the unique id for all warnings.
-const int kWarningId = -1;
-
 // The value to give as the unique id for all password entries.
 const int kPasswordEntryId = -2;
 
 }  // namespace
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {
 }
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     TabContentsWrapper* tab_contents_wrapper,
@@ skipping 129 matching lines @@
     return;
   }
 
   SetBounds(bounds);
 
   std::vector<string16> empty(suggestions.size());
   std::vector<int> password_ids(suggestions.size(), kPasswordEntryId);
   ApplyAutofillSuggestions(suggestions, empty, empty, password_ids, -1);
 }
 
+void AutofillExternalDelegate::RemoveAutocompleteEntry(const string16& value) {
+  if (tab_contents_wrapper_) {
+    tab_contents_wrapper_->autocomplete_history_manager()->
+        OnRemoveAutocompleteEntry(autofill_query_field_.name, value);
+  }
+
+  AdjustIndicesAfterDeletion();

[Ilya Sherman, 2012/04/18 18:12:51]

nit: This probably makes sense to do in a follow-up CL, but we probably want to
migrate this code to match the changes in [
http://codereview.chromium.org/10024059 ], i.e. to use ids rather than indices
to identify various special entries, as there's less bookkeeping.

[csharp, 2012/04/19 15:33:24]

I just added that to this change. Let me remove a few lines without having to
add much.

+}
+
+void AutofillExternalDelegate::RemoveAutofillProfileOrCreditCard(
+    int unique_id) {
+  autofill_manager_->RemoveAutofillProfileOrCreditCard(unique_id);
+
+  AdjustIndicesAfterDeletion();
+}
+
+
 void AutofillExternalDelegate::DidEndTextFieldEditing() {
   has_shown_autofill_popup_for_current_edit_ = false;
 }
 
 bool AutofillExternalDelegate::DidAcceptAutofillSuggestions(
     const string16& value,
     int unique_id,
     unsigned index) {
   // If the selected element is a warning we don't want to do anything.
   if (unique_id == kWarningId)
@@ skipping 71 matching lines @@
         host->GetRoutingID()));
   }
 
   // Fill the values for the whole form.
   autofill_manager_->OnFillAutofillFormData(autofill_query_id_,
                                             autofill_query_form_,
                                             autofill_query_field_,
                                             unique_id);
 }
 
+void AutofillExternalDelegate::AdjustIndicesAfterDeletion() {
+  if (suggestions_clear_index_ != -1)
+    --suggestions_clear_index_;
+
+  if (suggestions_options_index_ != -1)
+    --suggestions_options_index_;
+}
+
 // Add a "!defined(OS_YOUROS) for each platform that implements this
 // in an autofill_external_delegate_YOUROS.cc.  Currently there are
 // none, so all platforms use the default.
 
 #if !defined(OS_ANDROID) && !defined(TOOLKIT_GTK)
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContentsWrapper*, AutofillManager*) {
   return NULL;
 }
 
 #endif