Add Delete Support to New Autofill UI

chrome/browser/autofill/autofill_popup_view.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/browser/autofill/autofill_popup_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/navigation_controller.h"
 #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 {
 
 // Used to indicate that no line is currently selected by the user.
 const int kNoSelection = -1;
 
 }  // end namespace
 
 AutofillPopupView::AutofillPopupView(
     content::WebContents* web_contents,
     AutofillExternalDelegate* external_delegate)
     : external_delegate_(external_delegate),
-      separator_index_(0),
       selected_line_(kNoSelection) {
   if (!web_contents)
     return;
 
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_HIDDEN,
                  content::Source<content::WebContents>(web_contents));
   registrar_.Add(
       this,
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<content::NavigationController>(
           &(web_contents->GetController())));
 }
 
 AutofillPopupView::~AutofillPopupView() {}
 
 void AutofillPopupView::Hide() {
   HideInternal();
 
   external_delegate_->ClearPreviewedForm();
 }
 
 void AutofillPopupView::Show(const std::vector<string16>& autofill_values,
                              const std::vector<string16>& autofill_labels,
                              const std::vector<string16>& autofill_icons,
-                             const std::vector<int>& autofill_unique_ids,
-                             int separator_index) {
+                             const std::vector<int>& autofill_unique_ids) {
   autofill_values_ = autofill_values;
   autofill_labels_ = autofill_labels;
   autofill_icons_ = autofill_icons;
   autofill_unique_ids_ = autofill_unique_ids;
 
-  separator_index_ = separator_index;
-
   ShowInternal();
 }
 
 void AutofillPopupView::SetSelectedLine(int selected_line) {
   if (selected_line_ == selected_line)
     return;
 
   if (selected_line_ != kNoSelection)
     InvalidateRow(selected_line_);
 
   if (selected_line != kNoSelection)
     InvalidateRow(selected_line);
 
   selected_line_ = selected_line;
 
   if (selected_line_ != kNoSelection) {
     external_delegate_->SelectAutofillSuggestionAtIndex(
-        autofill_unique_ids_[selected_line_],
-        selected_line);
+        autofill_unique_ids_[selected_line_]);
   }
 }
 
 void AutofillPopupView::SelectNextLine() {
   int new_selected_line = selected_line_ + 1;
 
   if (new_selected_line == static_cast<int>(autofill_values_.size()))
     new_selected_line = 0;
 
   SetSelectedLine(new_selected_line);
@@ skipping 18 matching lines @@
   return external_delegate()->DidAcceptAutofillSuggestions(
       autofill_values_[selected_line_],
       autofill_unique_ids_[selected_line_],
       selected_line_);
 }
 
 bool AutofillPopupView::RemoveSelectedLine() {
   if (selected_line_ == kNoSelection)
     return false;
 
-  // TODO(csharp) add removal code.
-  return false;
+  DCHECK_GE(selected_line_, 0);
+  DCHECK_LT(selected_line_, static_cast<int>(autofill_values_.size()));
+
+  if (!CanDelete(autofill_unique_ids_[selected_line_]))
+    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_]);
+  }
+
+  // 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 || !CanDelete(autofill_unique_ids_[0]))

[Ilya Sherman, 2012/04/24 20:08:12]

I don't think this check will quite make sense once we include DataList
suggestions, since they might be above Autofill suggestions.

[csharp, 2012/04/25 15:05:09]

Done.

+    Hide();
+
+  return true;
+}
+
+bool AutofillPopupView::IsSeparatorIndex(int index) {
+  return (index > 0 && autofill_unique_ids_[index - 1] >= 0 &&
+          autofill_unique_ids_[index] < 0);

[Ilya Sherman, 2012/04/24 20:08:12]

Hmm, why isn't this just "return autofill_unique_ids[index] ==
WebAutofillClient::MenuItemIDSeparator"?

[csharp, 2012/04/25 15:05:09]

WebAutofillClient::MenuItemIDsperator is only set in the old Autofill UI right
now. I've added a bug to change this to use that id since its more work than I'd
like to add to this change as it would introduce an elements that doesn't appear
as a full row when drawing the popup.

MenuItemIDSeparator isn't set for any of the lists passed to the new Autofill UI
right now, only 

+}
+
+bool AutofillPopupView::CanDelete(int id) {
+  return id != WebAutofillClient::MenuItemIDWarningMessage &&
+      id != WebAutofillClient::MenuItemIDClearForm &&
+      id != WebAutofillClient::MenuItemIDAutofillOptions;

[Ilya Sherman, 2012/04/24 20:08:12]

Since the full set of ids might grow over time, it's probably better to check
for equality to deletable types rather than inequality to non-deletable types
here.

[csharp, 2012/04/25 15:05:09]

Done.

 }
 
 void AutofillPopupView::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_WEB_CONTENTS_HIDDEN
       || type == content::NOTIFICATION_NAV_ENTRY_COMMITTED)
     Hide();
 }