Move IPC reception handling from AutofillManager to AutofillDriverImpl.

components/autofill/core/browser/autofill_manager.h

 // Copyright 2013 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 COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 19 matching lines @@
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/forms_seen_state.h"
 #include "content/public/common/ssl_status.h"
 #include "third_party/WebKit/public/web/WebFormElement.h"
 
 class GURL;
 
 namespace content {
 class RenderViewHost;
 class WebContents;
-struct FrameNavigateParams;
-struct LoadCommittedDetails;
 }
 
 namespace gfx {
 class Rect;
 class RectF;
 }
 
-namespace IPC {
-class Message;
-}
-
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace autofill {
 
 class AutofillDriver;
 class AutofillDataModel;
 class AutofillDownloadManager;
 class AutofillExternalDelegate;
@@ skipping 70 matching lines @@
 
   autofill::AutofillManagerDelegate* delegate() const {
     return manager_delegate_;
   }
 
   const std::string& app_locale() const { return app_locale_; }
 
   // Only for testing.
   void SetTestDelegate(autofill::AutofillManagerTestDelegate* delegate);
 
-  // TODO(blundell): Move the logic in these methods into AutofillDriver and
-  // eliminate these methods.
-  virtual void DidNavigateMainFrame(
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params);
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  void OnFormsSeen(const std::vector<FormData>& forms,
+                   const base::TimeTicks& timestamp,
+                   autofill::FormsSeenState state);
+
+  // Processes the submitted |form|, saving any new Autofill data and uploading
+  // the possible field types for the submitted fields to the crowdsouring
+  // server.  Returns false if this form is not relevant for Autofill.
+  bool OnFormSubmitted(const FormData& form,
+                       const base::TimeTicks& timestamp);
+
+  void OnTextFieldDidChange(const FormData& form,
+                            const FormFieldData& field,
+                            const base::TimeTicks& timestamp);
+
+  // The |bounding_box| is a window relative value.
+  void OnQueryFormFieldAutofill(int query_id,
+                                const FormData& form,
+                                const FormFieldData& field,
+                                const gfx::RectF& bounding_box,
+                                bool display_warning);
+  void OnDidEndTextFieldEditing();
+  void OnHideAutofillUi();
+  void OnAddPasswordFormMapping(
+      const FormFieldData& form,
+      const PasswordFormFillData& fill_data);
+  void OnShowPasswordSuggestions(
+      const FormFieldData& field,
+      const gfx::RectF& bounds,
+      const std::vector<base::string16>& suggestions);
+  void OnSetDataList(const std::vector<base::string16>& values,
+                     const std::vector<base::string16>& labels,
+                     const std::vector<base::string16>& icons,
+                     const std::vector<int>& unique_ids);
+
+  // Requests an interactive autocomplete UI be shown.
+  void OnRequestAutocomplete(const FormData& form,
+                             const GURL& frame_url);
+
+  // Called to signal clicking an element failed in some way during an
+  // Autocheckout flow.
+  void OnClickFailed(autofill::AutocheckoutStatus status);
+
+  // Shows the Autocheckout bubble if conditions are right. See comments for
+  // AutocheckoutManager::MaybeShowAutocheckoutBubble. Input element requesting
+  // bubble belongs to |form|. |bounding_box| is the bounding box of the input
+  // field in focus.
+  virtual void OnMaybeShowAutocheckoutBubble(const FormData& form,
+                                             const gfx::RectF& bounding_box);
+
+  // Resets cache.
+  void Reset();
 
  protected:
   // Test code should prefer to use this constructor.
   AutofillManager(AutofillDriver* driver,
                   autofill::AutofillManagerDelegate* delegate,
                   PersonalDataManager* personal_data);
 
   // Returns the value of the AutofillEnabled pref.
   virtual bool IsAutofillEnabled() const;
 
   // Uploads the form data to the Autofill server.
   virtual void UploadFormData(const FormStructure& submitted_form);
 
-  // Reset cache.
-  void Reset();
-
   // Logs quality metrics for the |submitted_form| and uploads the form data
   // to the crowdsourcing server, if appropriate.
   virtual void UploadFormDataAsyncCallback(
       const FormStructure* submitted_form,
       const base::TimeTicks& load_time,
       const base::TimeTicks& interaction_time,
       const base::TimeTicks& submission_time);
 
-  // Shows the Autocheckout bubble if conditions are right. See comments for
-  // AutocheckoutManager::MaybeShowAutocheckoutBubble. Input element requesting
-  // bubble belongs to |form|. |bounding_box| is the bounding box of the input
-  // field in focus.
-  virtual void OnMaybeShowAutocheckoutBubble(const FormData& form,
-                                             const gfx::RectF& bounding_box);
-
   // Maps GUIDs to and from IDs that are used to identify profiles and credit
   // cards sent to and from the renderer process.
   virtual int GUIDToID(const PersonalDataManager::GUIDPair& guid) const;
   virtual const PersonalDataManager::GUIDPair IDToGUID(int id) const;
 
   // Methods for packing and unpacking credit card and profile IDs for sending
   // and receiving to and from the renderer process.
   int PackGUIDs(const PersonalDataManager::GUIDPair& cc_guid,
                 const PersonalDataManager::GUIDPair& profile_guid) const;
   void UnpackGUIDs(int id,
                    PersonalDataManager::GUIDPair* cc_guid,
                    PersonalDataManager::GUIDPair* profile_guid) const;
 
   const AutofillMetrics* metric_logger() const { return metric_logger_.get(); }
   void set_metric_logger(const AutofillMetrics* metric_logger);
 
   ScopedVector<FormStructure>* form_structures() { return &form_structures_; }
 
   // Exposed for testing.
   AutofillExternalDelegate* external_delegate() {
     return external_delegate_;
   }
 
   // Exposed for testing.
   autofill::AutocheckoutManager* autocheckout_manager() {
     return &autocheckout_manager_;
   }
 
-  // Processes the submitted |form|, saving any new Autofill data and uploading
-  // the possible field types for the submitted fields to the crowdsouring
-  // server.  Returns false if this form is not relevant for Autofill.
-  bool OnFormSubmitted(const FormData& form,
-                       const base::TimeTicks& timestamp);
-
   // Tell the renderer the current interactive autocomplete finished.
   virtual void ReturnAutocompleteResult(
       WebKit::WebFormElement::AutocompleteResult result,
       const FormData& form_data);
 
  private:
 
   // AutofillDownloadManager::Observer:
   virtual void OnLoadedServerPredictions(
       const std::string& response_xml) OVERRIDE;
 
-  void OnFormsSeen(const std::vector<FormData>& forms,
-                   const base::TimeTicks& timestamp,
-                   autofill::FormsSeenState state);
-  void OnTextFieldDidChange(const FormData& form,
-                            const FormFieldData& field,
-                            const base::TimeTicks& timestamp);
-
-  // The |bounding_box| is a window relative value.
-  void OnQueryFormFieldAutofill(int query_id,
-                                const FormData& form,
-                                const FormFieldData& field,
-                                const gfx::RectF& bounding_box,
-                                bool display_warning);
-  void OnDidEndTextFieldEditing();
-  void OnHideAutofillUi();
-  void OnAddPasswordFormMapping(
-      const FormFieldData& form,
-      const PasswordFormFillData& fill_data);
-  void OnShowPasswordSuggestions(
-      const FormFieldData& field,
-      const gfx::RectF& bounds,
-      const std::vector<base::string16>& suggestions);
-  void OnSetDataList(const std::vector<base::string16>& values,
-                     const std::vector<base::string16>& labels,
-                     const std::vector<base::string16>& icons,
-                     const std::vector<int>& unique_ids);
-
-  // Requests an interactive autocomplete UI be shown.
-  void OnRequestAutocomplete(const FormData& form,
-                             const GURL& frame_url);
-
   // Passes return data for an OnRequestAutocomplete call back to the page.
   void ReturnAutocompleteData(const FormStructure* result,
                               const std::string& unused_transaction_id);
 
-  // Called to signal clicking an element failed in some way during an
-  // Autocheckout flow.
-  void OnClickFailed(autofill::AutocheckoutStatus status);
-
   // Returns the matched whitelist URL prefix for the current tab's url.
   virtual std::string GetAutocheckoutURLPrefix() const;
 
   // Fills |host| with the RenderViewHost for this tab.
   // Returns false if Autofill is disabled or if the host is unavailable.
   bool GetHost(content::RenderViewHost** host) const WARN_UNUSED_RESULT;
 
   // Unpacks |unique_id| and fills |form_group| and |variant| with the
   // appropriate data source and variant index.  Returns false if the unpacked
   // id cannot be found.
@@ skipping 147 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest,
                            UserHappinessFormLoadAndSubmission);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, UserHappinessFormInteraction);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_MANAGER_H_