Add Delete Support to New Autofill UI

chrome/browser/autofill/autofill_popup_view.cc

Index: chrome/browser/autofill/autofill_popup_view.cc
diff --git a/chrome/browser/autofill/autofill_popup_view.cc b/chrome/browser/autofill/autofill_popup_view.cc
index 657fc4b7640d51470107e455f4fc979b65c529f2..dc0bd5621fdfddfb7f5f700f39e41db6ddc3ccf7 100644
--- a/chrome/browser/autofill/autofill_popup_view.cc
+++ b/chrome/browser/autofill/autofill_popup_view.cc
@@ -11,6 +11,9 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
+
+using WebKit::WebAutofillClient;
 
 namespace {
 
@@ -75,8 +78,7 @@ void AutofillPopupView::SetSelectedLine(int selected_line) {
 
   if (selected_line_ != kNoSelection) {
     external_delegate_->SelectAutofillSuggestionAtIndex(
-        autofill_unique_ids_[selected_line_],
-        selected_line);
+        autofill_unique_ids_[selected_line_]);
   }
 }
 
@@ -112,11 +114,45 @@ bool AutofillPopupView::AcceptSelectedLine() {
 }
 
 bool AutofillPopupView::RemoveSelectedLine() {
-  if (selected_line_ == kNoSelection)
+  if (selected_line_ == kNoSelection ||
+      (separator_index_ != -1 && separator_index_ <= selected_line_))
+    return false;
+
+  DCHECK_GE(selected_line_, 0);
+  DCHECK_LT(selected_line_, static_cast<int>(autofill_values_.size()));
+
+  // Don't remove  warnings
+  if (autofill_unique_ids_[selected_line_] ==
+      WebAutofillClient::MenuItemIDWarningMessage)
     return false;
 
-  // TODO(csharp) add removal code.
-  return false;
+  if (autofill_unique_ids_[selected_line_] > 0) {
+    external_delegate()->RemoveAutofillProfileOrCreditCard(
+        autofill_unique_ids_[selected_line_]);
+  } else {
+    external_delegate()->RemoveAutocompleteEntry(
+        autofill_values_[selected_line_]);
+  }
+
+  // Decrease the separator since there is one less entry above it.
+  --separator_index_;
+
+  // Remove the deleted element.
+  autofill_values_.erase(autofill_values_.begin() + selected_line_);
+  autofill_labels_.erase(autofill_labels_.begin() + selected_line_);
+  autofill_icons_.erase(autofill_icons_.begin() + selected_line_);
+  autofill_unique_ids_.erase(autofill_unique_ids_.begin() + selected_line_);
+
+  // Resize the popup.
+  ResizePopup();
+
+  SetSelectedLine(kNoSelection);
+
+  // Hide the popup if all the Autofill entries are gone.
+  if (autofill_values_.size() == 0 || separator_index_ == 0)
+    Hide();
+
+  return true;
 }
 
 void AutofillPopupView::Observe(int type,