AutofillPopupController clarifications + simplifications.

chrome/browser/autofill/autofill_external_delegate.h

Index: chrome/browser/autofill/autofill_external_delegate.h
diff --git a/chrome/browser/autofill/autofill_external_delegate.h b/chrome/browser/autofill/autofill_external_delegate.h
index 2f278e5c5e440d3ed87655a56832a97a35e8407f..553b3da212efe80f58e58965c8d84cdc30260cbe 100644
--- a/chrome/browser/autofill/autofill_external_delegate.h
+++ b/chrome/browser/autofill/autofill_external_delegate.h
@@ -9,8 +9,8 @@
 
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "chrome/browser/autofill/autofill_popup_delegate.h"
 #include "chrome/browser/autofill/password_autofill_manager.h"
+#include "chrome/browser/ui/autofill/autofill_popup_delegate.h"
 #include "chrome/common/form_data.h"
 #include "chrome/common/form_field_data.h"
 #include "chrome/common/password_form_fill_data.h"
@@ -47,13 +47,12 @@ class AutofillExternalDelegate
                                              AutofillManager* autofill_manager);
 
   // AutofillPopupDelegate implementation.
-  virtual void SelectAutofillSuggestionAtIndex(int unique_id) OVERRIDE;
-  virtual bool DidAcceptAutofillSuggestion(const string16& value,
-                                           int unique_id,
-                                           unsigned index) OVERRIDE;
-  virtual void ClearPreviewedForm() OVERRIDE;
+  virtual void DidSelectSuggestion(int identifier) OVERRIDE;
+  virtual void DidAcceptSuggestion(const string16& value,
+                                           int identifier) OVERRIDE;

[Ilya Sherman, 2012/12/20 21:57:42]

nit: Alignment

[Evan Stade, 2012/12/20 23:04:00]

Done.

+  virtual void RemoveSuggestion(int identifier) OVERRIDE;
   virtual void RemoveAutocompleteEntry(const string16& value) OVERRIDE;

[Ilya Sherman, 2012/12/20 21:57:42]

Let's combine these two methods into a single method that either takes an index
or a value+identifier.  "RemoveSuggestion" sounds like it should be able to
handle suggestions of any type, whereas it currently only supports Autofill
profiles or credit cards.

[Evan Stade, 2012/12/20 23:04:00]

Done.

-  virtual void RemoveAutofillProfileOrCreditCard(int unique_id) OVERRIDE;
+  virtual void ClearPreviewedForm() OVERRIDE;
   virtual void ControllerDestroyed() OVERRIDE;
 
   // Records and associates a query_id with web form data.  Called