AutofillPopupController clarifications + simplifications.

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/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/common/autofill_messages.h"
@@ skipping 50 matching lines @@
         content::Source<content::NavigationController>(
             &(web_contents->GetController())));
   }
 }
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {
   if (controller_)
     controller_->Hide();
 }
 
-void AutofillExternalDelegate::SelectAutofillSuggestion(int unique_id) {
-  ClearPreviewedForm();
-
-  // Only preview the data if it is a profile.
-  if (unique_id > 0)
-    FillAutofillFormData(unique_id, true);
-}
-
 void AutofillExternalDelegate::OnQuery(int query_id,
                                        const FormData& form,
                                        const FormFieldData& field,
                                        const gfx::Rect& element_bounds,
                                        bool display_warning_if_disabled) {
   autofill_query_form_ = form;
   autofill_query_field_ = field;
   display_warning_if_disabled_ = display_warning_if_disabled;
   autofill_query_id_ = query_id;
 
@@ skipping 109 matching lines @@
     const std::vector<string16>& data_list_values,
     const std::vector<string16>& data_list_labels,
     const std::vector<string16>& data_list_icons,
     const std::vector<int>& data_list_unique_ids) {
   data_list_values_ = data_list_values;
   data_list_labels_ = data_list_labels;
   data_list_icons_ = data_list_icons;
   data_list_unique_ids_ = data_list_unique_ids;
 }
 
-void AutofillExternalDelegate::RemoveAutocompleteEntry(const string16& value) {
-  if (web_contents_) {
-    autofill_manager_->RemoveAutocompleteEntry(
-        autofill_query_field_.name, value);
-  }
+void AutofillExternalDelegate::DidSelectSuggestion(int identifier) {
+  ClearPreviewedForm();
+
+  // Only preview the data if it is a profile.
+  if (identifier > 0)
+    FillAutofillFormData(identifier, true);
 }
 
-void AutofillExternalDelegate::RemoveAutofillProfileOrCreditCard(
-    int unique_id) {
-  autofill_manager_->RemoveAutofillProfileOrCreditCard(unique_id);
+void AutofillExternalDelegate::DidAcceptSuggestion(const string16& value,
+                                                   int identifier) {
+  RenderViewHost* host = web_contents_->GetRenderViewHost();
+
+  if (identifier == WebAutofillClient::MenuItemIDAutofillOptions) {
+    // User selected 'Autofill Options'.
+    autofill_manager_->OnShowAutofillDialog();
+  } else if (identifier == WebAutofillClient::MenuItemIDClearForm) {
+    // User selected 'Clear form'.
+    host->Send(new AutofillMsg_ClearForm(host->GetRoutingID()));
+  } else if (identifier == WebAutofillClient::MenuItemIDPasswordEntry &&
+             password_autofill_manager_.DidAcceptAutofillSuggestion(
+                 autofill_query_field_, value)) {
+    // DidAcceptAutofillSuggestion has already handled the work to fill in
+    // the page as required.
+  } else if (identifier == WebAutofillClient::MenuItemIDDataListEntry) {
+    host->Send(new AutofillMsg_AcceptDataListSuggestion(host->GetRoutingID(),
+                                                        value));
+  } else if (identifier == WebAutofillClient::MenuItemIDAutocompleteEntry) {
+    // User selected an Autocomplete, so we fill directly.
+    host->Send(new AutofillMsg_SetNodeText(host->GetRoutingID(), value));
+  } else {
+    FillAutofillFormData(identifier, false);
+  }
+
+  HideAutofillPopup();
+}
+
+void AutofillExternalDelegate::RemoveSuggestion(const string16& value,
+                                                int identifier) {
+  if (identifier > 0) {
+    autofill_manager_->RemoveAutofillProfileOrCreditCard(identifier);
+  } else if (web_contents_) {
+    autofill_manager_->RemoveAutocompleteEntry(autofill_query_field_.name,
+                                               value);
+  }
 }
 
 void AutofillExternalDelegate::DidEndTextFieldEditing() {
   HideAutofillPopup();
 
   has_shown_autofill_popup_for_current_edit_ = false;
 }
 
-bool AutofillExternalDelegate::DidAcceptAutofillSuggestion(
-    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;
-
-  RenderViewHost* host = web_contents_->GetRenderViewHost();
-
-  if (unique_id == WebAutofillClient::MenuItemIDAutofillOptions) {
-    // User selected 'Autofill Options'.
-    autofill_manager_->OnShowAutofillDialog();
-  } else if (unique_id == WebAutofillClient::MenuItemIDClearForm) {
-    // User selected 'Clear form'.
-    host->Send(new AutofillMsg_ClearForm(host->GetRoutingID()));
-  } else if (unique_id == WebAutofillClient::MenuItemIDPasswordEntry &&
-             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 == WebAutofillClient::MenuItemIDDataListEntry) {
-    host->Send(new AutofillMsg_AcceptDataListSuggestion(host->GetRoutingID(),
-                                                        value));
-  } else if (unique_id == WebAutofillClient::MenuItemIDAutocompleteEntry) {
-    // User selected an Autocomplete, so we fill directly.
-    host->Send(new AutofillMsg_SetNodeText(
-        host->GetRoutingID(),
-        value));
-  } else {
-    FillAutofillFormData(unique_id, false);
-  }
-
-  HideAutofillPopup();
-
-  return true;
-}
-
 void AutofillExternalDelegate::ClearPreviewedForm() {
   if (web_contents_) {
     RenderViewHost* host = web_contents_->GetRenderViewHost();
 
     if (host)
       host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID()));
   }
 }
 
 void AutofillExternalDelegate::ControllerDestroyed() {
@@ skipping 18 matching lines @@
 }
 
 void AutofillExternalDelegate::AddPasswordFormMapping(
       const FormFieldData& form,
       const PasswordFormFillData& fill_data) {
   password_autofill_manager_.AddPasswordFormMapping(form, fill_data);
 }
 
 void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
                                                     bool is_preview) {
+  // If the selected element is a warning we don't want to do anything.
+  if (unique_id == WebAutofillClient::MenuItemIDWarningMessage)
+    return;
+
   RenderViewHost* host = web_contents_->GetRenderViewHost();
 
   if (is_preview) {
     host->Send(new AutofillMsg_SetAutofillActionPreview(
         host->GetRoutingID()));
   } else {
     host->Send(new AutofillMsg_SetAutofillActionFill(
         host->GetRoutingID()));
   }
 
@@ skipping 103 matching lines @@
     if (!*content::Details<bool>(details).ptr())
       HideAutofillPopup();
   } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     HideAutofillPopup();
   } else {
     NOTREACHED();
   }
 }