AutofillPopupController clarifications + simplifications.

chrome/browser/autofill/autofill_external_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_H_
 
 #include <vector>
 
 #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"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "ui/gfx/rect.h"
 
 class AutofillManager;
 class AutofillPopupControllerImpl;
@@ skipping 16 matching lines @@
       public content::NotificationObserver,
       public AutofillPopupDelegate {
  public:
   // Creates an AutofillExternalDelegate and attaches it to the specified
   // contents; the second argument is an AutofillManager managing Autofill for
   // that WebContents.
   static void CreateForWebContentsAndManager(content::WebContents* web_contents,
                                              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 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 ClearPreviewedForm() OVERRIDE;
-  virtual void RemoveAutocompleteEntry(const string16& value) OVERRIDE;
-  virtual void RemoveAutofillProfileOrCreditCard(int unique_id) OVERRIDE;
   virtual void ControllerDestroyed() OVERRIDE;
 
   // Records and associates a query_id with web form data.  Called
   // when the renderer posts an Autofill query to the browser. |bounds|
   // is window relative. |display_warning_if_disabled| tells us if we should
   // display warnings (such as autofill is disabled, but had suggestions).
   // We might not want to display the warning if a website has disabled
   // Autocomplete because they have their own popup, and showing our popup
   // on to of theirs would be a poor user experience.
   virtual void OnQuery(int query_id,
@@ skipping 122 matching lines @@
   // The current data list values.
   std::vector<string16> data_list_values_;
   std::vector<string16> data_list_labels_;
   std::vector<string16> data_list_icons_;
   std::vector<int> data_list_unique_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegate);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_EXTERNAL_DELEGATE_H_