Move the UI related code from AutofillExternalDelegate to AutofillManagerDelegate

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/memory/weak_ptr.h"
 #include "base/string16.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;

[Ilya Sherman, 2013/02/26 02:12:15]

nit: Can this be removed?

[kaiwang, 2013/02/26 05:24:12]

Done.

 
 namespace gfx {
 class Rect;
 }
 
 namespace content {
 class WebContents;
 }
 
 // TODO(csharp): A lot of the logic in this class is copied from autofillagent.
@@ skipping 60 matching lines @@
 
   // Returns the delegate to its starting state by removing any page specific
   // values or settings.
   void Reset();
 
   // Inform the Password Manager of a filled form.
   void AddPasswordFormMapping(
       const FormFieldData& form,
       const PasswordFormFillData& fill_data);
 
   virtual void HideAutofillPopup();

[Ilya Sherman, 2013/02/26 02:12:15]

nit: If you do keep this method, please reduce its visibility.

[Ilya Sherman, 2013/02/26 09:24:57]

^^^

[kaiwang, 2013/02/26 22:18:40]

Done.

 
  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
   // would be selected and if |is_preview| is false then the user has selected
   // this data.
   void FillAutofillFormData(int unique_id, bool is_preview);
 
   // Handle applying any Autofill warnings to the Autofill popup.
   void ApplyAutofillWarnings(std::vector<string16>* autofill_values,
                              std::vector<string16>* autofill_labels,
@@ skipping 16 matching lines @@
                             std::vector<int>* autofill_unique_ids);
 
   // content::NotificationObserver method override.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // 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_;
 
   // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.
   int autofill_query_id_;
 
   // A scoped container for notification registries.
   content::NotificationRegistrar registrar_;
 
   // The current form and field selected by Autofill.
   FormData autofill_query_form_;
   FormFieldData autofill_query_field_;
 
+  // The current bounding of Autofill popup.

[Ilya Sherman, 2013/02/26 02:12:15]

nit: These bounds are for the form field that the user is interacting with, not
the Autofill popup.

[kaiwang, 2013/02/26 05:24:12]

Done.

+  gfx::RectF autofill_popup_bounding_;

[Ilya Sherman, 2013/02/26 02:12:15]

nit: Please name this "element_bounds_".

[kaiwang, 2013/02/26 05:24:12]

Done.

+
   // Should we display a warning if Autofill is disabled?
   bool display_warning_if_disabled_;
 
   // Does the popup include any Autofill profile or credit card suggestions?
   bool has_autofill_suggestion_;
 
   // Have we already shown Autofill suggestions for the field the user is
   // currently editing?  Used to keep track of state for metrics logging.
   bool has_shown_autofill_popup_for_current_edit_;
 
   // The RenderViewHost that this object has been registered with as a
   // keyboard listener.
   content::RenderViewHost* registered_keyboard_listener_with_;
 
   // 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_