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 "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::RenderViewHost;
 using WebKit::WebAutofillClient;
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {
 }
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     TabContentsWrapper* tab_contents_wrapper,
     AutofillManager* autofill_manager)
     : tab_contents_wrapper_(tab_contents_wrapper),
       autofill_manager_(autofill_manager),
       password_autofill_manager_(
           tab_contents_wrapper ? tab_contents_wrapper->web_contents() : NULL),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
-      has_shown_autofill_popup_for_current_edit_(false),
-      suggestions_clear_index_(-1),
-      suggestions_options_index_(-1) {
+      has_shown_autofill_popup_for_current_edit_(false) {
 }
 
-void AutofillExternalDelegate::SelectAutofillSuggestionAtIndex(int unique_id,
-                                                               int list_index) {
+void AutofillExternalDelegate::SelectAutofillSuggestionAtIndex(int unique_id) {
   if (password_autofill_manager_.DidSelectAutofillSuggestion(
           autofill_query_field_))
     return;
 
-  if (list_index == suggestions_options_index_ ||
-      list_index == suggestions_clear_index_ ||
+  if (unique_id == WebAutofillClient::MenuItemIDAutofillOptions ||
+      unique_id == WebAutofillClient::MenuItemIDClearForm ||
       unique_id == WebAutofillClient::MenuItemIDWarningMessage)
     return;
 
   FillAutofillFormData(unique_id, true);
 }
 
 void AutofillExternalDelegate::OnQuery(int query_id,
                                        const webkit::forms::FormData& form,
                                        const webkit::forms::FormField& field,
                                        const gfx::Rect& bounds,
@@ skipping 18 matching lines @@
   if (values.empty()) {
     // No suggestions, any popup currently showing is obsolete.
     HideAutofillPopup();
     return;
   }
 
   std::vector<string16> v(values);
   std::vector<string16> l(labels);
   std::vector<string16> i(icons);
   std::vector<int> ids(unique_ids);
-  int separator_index = -1;
 
   DCHECK_GT(ids.size(), 0U);
   if (!autofill_query_field_.should_autocomplete) {
     // If autofill is disabled and we had suggestions, show a warning instead.
     v.assign(1, l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_FORM_DISABLED));
     l.assign(1, string16());
     i.assign(1, string16());
     ids.assign(1, WebAutofillClient::MenuItemIDWarningMessage);
   } else if (ids[0] < 0 && ids.size() > 1) {
     // If we received a warning instead of suggestions from autofill but regular
@@ skipping 13 matching lines @@
   bool has_autofill_item = false;
   for (size_t i = 0; i < ids.size(); ++i) {
     if (ids[i] > 0) {
       has_autofill_item = true;
       break;
     }
   }
 
   // The form has been auto-filled, so give the user the chance to clear the
   // form.  Append the 'Clear form' menu item.
-  if (has_autofill_item &&
-      autofill_query_field_.is_autofilled) {
+  if (has_autofill_item && autofill_query_field_.is_autofilled) {
     v.push_back(l10n_util::GetStringUTF16(IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM));
     l.push_back(string16());
     i.push_back(string16());
-    ids.push_back(0);
-    suggestions_clear_index_ = v.size() - 1;
-    separator_index = v.size() - 1;
+    ids.push_back(WebAutofillClient::MenuItemIDClearForm);
   }
 
   if (has_autofill_item) {
     // Append the 'Chrome Autofill options' menu item;
     v.push_back(l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS_POPUP));
     l.push_back(string16());
     i.push_back(string16());
-    ids.push_back(0);
-    suggestions_options_index_ = v.size() - 1;
-    separator_index = values.size();
+    ids.push_back(WebAutofillClient::MenuItemIDAutofillOptions);
   }
 
   // Send to display.
   if (!v.empty() && autofill_query_field_.is_focusable)
-    ApplyAutofillSuggestions(v, l, i, ids, separator_index);
+    ApplyAutofillSuggestions(v, l, i, ids);
 
   tab_contents_wrapper_->autofill_manager()->OnDidShowAutofillSuggestions(
       has_autofill_item && !has_shown_autofill_popup_for_current_edit_);
   has_shown_autofill_popup_for_current_edit_ |= has_autofill_item;
 }
 
 void AutofillExternalDelegate::OnShowPasswordSuggestions(
     const std::vector<string16>& suggestions,
     const webkit::forms::FormField& field,
     const gfx::Rect& bounds) {
   autofill_query_field_ = field;
 
   if (suggestions.empty()) {
     HideAutofillPopup();
     return;
   }
 
   SetBounds(bounds);
 
   std::vector<string16> empty(suggestions.size());
   std::vector<int> password_ids(suggestions.size(),
                                 WebAutofillClient::MenuItemIDPasswordEntry);
-  ApplyAutofillSuggestions(suggestions, empty, empty, password_ids, -1);
+  ApplyAutofillSuggestions(suggestions, empty, empty, password_ids);
 }
 
+void AutofillExternalDelegate::RemoveAutocompleteEntry(const string16& value) {
+  if (tab_contents_wrapper_) {
+    tab_contents_wrapper_->autocomplete_history_manager()->
+        OnRemoveAutocompleteEntry(autofill_query_field_.name, value);
+  }
+}
+
+void AutofillExternalDelegate::RemoveAutofillProfileOrCreditCard(
+    int unique_id) {
+  autofill_manager_->RemoveAutofillProfileOrCreditCard(unique_id);
+}
+
+
 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 == WebAutofillClient::MenuItemIDWarningMessage)
     return false;
 
-  if (suggestions_options_index_ != -1 &&
-      index == static_cast<unsigned>(suggestions_options_index_)) {
+  if (unique_id == WebAutofillClient::MenuItemIDAutofillOptions) {
     // User selected 'Autofill Options'.
     autofill_manager_->OnShowAutofillDialog();
-  } else if (suggestions_clear_index_ != -1 &&
-             index == static_cast<unsigned>(suggestions_clear_index_)) {
+  } else if (unique_id == WebAutofillClient::MenuItemIDClearForm) {
     // User selected 'Clear form'.
     RenderViewHost* host =
         tab_contents_wrapper_->web_contents()->GetRenderViewHost();
     host->Send(new AutofillMsg_ClearForm(host->GetRoutingID()));
   } else if (password_autofill_manager_.DidAcceptAutofillSuggestion(
                  autofill_query_field_, value)) {
     // DidAcceptAutofillSuggestion has already handled the work to fill in
     // the page as required.
-  } else if (!unique_id) {
+  } else if (unique_id == WebAutofillClient::MenuItemIDAutocompleteEntry) {
     // User selected an Autocomplete, so we fill directly.
     RenderViewHost* host =
         tab_contents_wrapper_->web_contents()->GetRenderViewHost();
     host->Send(new AutofillMsg_SetNodeText(
         host->GetRoutingID(),
         value));
   } else {
     FillAutofillFormData(unique_id, false);
   }
 
   HideAutofillPopup();
 
   return true;
 }
 
 void AutofillExternalDelegate::ClearPreviewedForm() {
   if (password_autofill_manager_.DidClearAutofillSelection(
           autofill_query_field_))
     return;
 
   RenderViewHost* host =
       tab_contents_wrapper_->web_contents()->GetRenderViewHost();
   host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID()));
 }
 
 void AutofillExternalDelegate::HideAutofillPopup() {
-  suggestions_clear_index_ = -1;
-  suggestions_options_index_ = -1;
-
   HideAutofillPopupInternal();
 }
 
 void AutofillExternalDelegate::Reset() {
   HideAutofillPopup();
 
   password_autofill_manager_.Reset();
 }
 
 void AutofillExternalDelegate::AddPasswordFormMapping(
@@ skipping 27 matching lines @@
 // none, so all platforms use the default.
 
 #if !defined(OS_ANDROID) && !defined(TOOLKIT_GTK)
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContentsWrapper*, AutofillManager*) {
   return NULL;
 }
 
 #endif