Move the UI related code from AutofillExternalDelegate to AutofillManagerDelegate

chrome/browser/ui/autofill/tab_autofill_manager_delegate.h

Index: chrome/browser/ui/autofill/tab_autofill_manager_delegate.h
diff --git a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h
index 141c9758fc917f79dcf91de268ea8a04ad4dfbed..ed53ff03998f0212e0a85b3c546b6e6ec6028522 100644
--- a/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h
+++ b/chrome/browser/ui/autofill/tab_autofill_manager_delegate.h
@@ -6,11 +6,14 @@
 #define CHROME_BROWSER_UI_AUTOFILL_TAB_AUTOFILL_MANAGER_DELEGATE_H_
 
 #include "base/compiler_specific.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/autofill/autofill_manager_delegate.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
+class AutofillPopupControllerImpl;
+
 namespace content {
 struct FrameNavigateParams;
 struct LoadCommittedDetails;
@@ -27,7 +30,7 @@ class TabAutofillManagerDelegate
       public content::WebContentsUserData<TabAutofillManagerDelegate>,
       public content::WebContentsObserver {
  public:
-  virtual ~TabAutofillManagerDelegate() {}
+  virtual ~TabAutofillManagerDelegate();
 
   // AutofillManagerDelegate implementation.
   virtual InfoBarService* GetInfoBarService() OVERRIDE;
@@ -54,6 +57,13 @@ class TabAutofillManagerDelegate
       DialogType dialog_type,
       const base::Callback<void(const FormStructure*)>& callback) OVERRIDE;
   virtual void RequestAutocompleteDialogClosed() OVERRIDE;
+  virtual void ShowAutofillPopup(const gfx::RectF& element_bounds,
+                                 const std::vector<string16>& values,
+                                 const std::vector<string16>& labels,
+                                 const std::vector<string16>& icons,
+                                 const std::vector<int>& identifiers,
+                                 AutofillPopupDelegate* delegate) OVERRIDE;
+  virtual void HideAutofillPopup() OVERRIDE;
   virtual void UpdateProgressBar(double value) OVERRIDE;
 
   // content::WebContentsObserver implementation.
@@ -66,7 +76,8 @@ class TabAutofillManagerDelegate
   friend class content::WebContentsUserData<TabAutofillManagerDelegate>;
 
   content::WebContents* const web_contents_;
-  AutofillDialogControllerImpl* autofill_dialog_controller_;  // weak.
+  AutofillDialogControllerImpl* dialog_controller_;  // weak.
+  base::WeakPtr<AutofillPopupControllerImpl> popup_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(TabAutofillManagerDelegate);
 };