Move the UI related code from AutofillExternalDelegate to AutofillManagerDelegate

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 d370bb0a9c0d20ac276fae231291387394f3dd92..9fc33dd31eab35d1fda6885a35183d975a186800 100644
--- a/chrome/browser/autofill/autofill_external_delegate.h
+++ b/chrome/browser/autofill/autofill_external_delegate.h
@@ -21,7 +21,6 @@
 #include "ui/gfx/rect.h"
 
 class AutofillManager;
-class AutofillPopupControllerImpl;
 
 namespace gfx {
 class Rect;
@@ -102,31 +101,14 @@ class AutofillExternalDelegate
       const FormFieldData& form,
       const PasswordFormFillData& fill_data);
 
-  virtual void HideAutofillPopup();
-
  protected:
   friend class content::WebContentsUserData<AutofillExternalDelegate>;
   AutofillExternalDelegate(content::WebContents* web_contents,
                            AutofillManager* autofill_manager);
   virtual ~AutofillExternalDelegate();
 
-  // Displays the Autofill results to the user with an external Autofill popup
-  // that lives completely in the browser.  The suggestions have been correctly
-  // formatted by this point.
-  virtual void ApplyAutofillSuggestions(
-      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);
-
-  // Create the popup if it doesn't already exist. |element_bounds| is the
-  // bounding rect for the element it is popping up for.
-  virtual void EnsurePopupForElement(const gfx::RectF& element_bounds);
-
   content::WebContents* web_contents() { return web_contents_; }
 
-  AutofillPopupControllerImpl* controller() { return controller_; }
-
  private:
   // Fills the form with the Autofill data corresponding to |unique_id|.
   // If |is_preview| is true then this is just a preview to show the user what
@@ -163,7 +145,6 @@ class AutofillExternalDelegate
   // The web_contents associated with this delegate.
   content::WebContents* web_contents_;  // weak; owns me.
   AutofillManager* autofill_manager_;  // weak.
-  base::WeakPtr<AutofillPopupControllerImpl> controller_;
 
   // Password Autofill manager, handles all password-related Autofilling.
   PasswordAutofillManager password_autofill_manager_;
@@ -179,6 +160,9 @@ class AutofillExternalDelegate
   FormData autofill_query_form_;
   FormFieldData autofill_query_field_;
 
+  // The bounds of the form field that user is interacting with.
+  gfx::RectF element_bounds_;
+
   // Should we display a warning if Autofill is disabled?
   bool display_warning_if_disabled_;