Move forms/ out of webkit/.

chrome/browser/autofill/autofill_manager.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_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 27 matching lines @@
 class ProfileSyncService;
 class TabContents;
 
 struct ViewHostMsg_FrameNavigate_Params;
 
 namespace autofill {
 class AutofillManagerDelegate;
 class PasswordGenerator;
 }
 
+namespace chrome {
+struct FormData;
+struct FormField;
+struct PasswordFormFillData;
+}
+
 namespace content {
 class RenderViewHost;
+struct PasswordForm;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace IPC {
 class Message;
 }
 
-namespace webkit {
-namespace forms {
-struct FormData;
-struct FormField;
-struct PasswordForm;
-struct PasswordFormFillData;
-}
-}
-
 // Manages saving and restoring the user's personal information entered into web
 // forms.
 class AutofillManager : public content::NotificationObserver,
                         public content::WebContentsObserver,
                         public AutofillDownloadManager::Observer,
                         public ProfileSyncServiceObserver,
                         public base::RefCounted<AutofillManager> {
  public:
   // Lifetime of |client| and |tab_contents| must exceed lifetime of
   // AutofillManager.
   explicit AutofillManager(autofill::AutofillManagerDelegate* delegate,
                            TabContents* tab_contents);
 
   // Registers our Enable/Disable Autofill pref.
   static void RegisterUserPrefs(PrefServiceBase* prefs);
 
   // Set our external delegate.
   // TODO(jrg): consider passing delegate into the ctor.  That won't
   // work if the delegate has a pointer to the AutofillManager, but
   // future directions may not need such a pointer.
   void SetExternalDelegate(AutofillExternalDelegate* delegate) {
     external_delegate_ = delegate;
   }
 
   // Used to say if this class has an external delegate that it is using.
   bool HasExternalDelegate();
 
   // Called from our external delegate so they cannot be private.
   virtual void OnFillAutofillFormData(int query_id,
-                                      const webkit::forms::FormData& form,
-                                      const webkit::forms::FormField& field,
+                                      const chrome::FormData& form,
+                                      const chrome::FormField& field,
                                       int unique_id);
   void OnDidShowAutofillSuggestions(bool is_new_popup);
   void OnDidFillAutofillFormData(const base::TimeTicks& timestamp);
   void OnShowAutofillDialog();
   void OnDidPreviewAutofillFormData();
   void OnShowPasswordGenerationPopup(const gfx::Rect& bounds,
                                      int max_length,
-                                     const webkit::forms::PasswordForm& form);
+                                     const content::PasswordForm& form);
 
   // Remove the credit card or Autofill profile that matches |unique_id|
   // from the database.
   void RemoveAutofillProfileOrCreditCard(int unique_id);
 
  protected:
   // Only test code should subclass AutofillManager.
   friend class base::RefCounted<AutofillManager>;
   virtual ~AutofillManager();
 
@@ skipping 46 matching lines @@
   ScopedVector<FormStructure>* form_structures() { return &form_structures_; }
 
   // Exposed for testing.
   AutofillExternalDelegate* external_delegate() {
     return external_delegate_;
   }
 
   // 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 webkit::forms::FormData& form,
+  bool OnFormSubmitted(const chrome::FormData& form,
                        const base::TimeTicks& timestamp);
 
  private:
   // content::WebContentsObserver:
   virtual void RenderViewCreated(content::RenderViewHost* host) OVERRIDE;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
@@ skipping 12 matching lines @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Determines what the current state of password generation is, and if it has
   // changed from |password_generation_enabled_|. If it has changed or if
   // |new_renderer| is true, it notifies the renderer of this change via
   // SendPasswordGenerationStateToRenderer.
   void UpdatePasswordGenerationState(content::RenderViewHost* host,
                                      bool new_renderer);
 
-  void OnFormsSeen(const std::vector<webkit::forms::FormData>& forms,
+  void OnFormsSeen(const std::vector<chrome::FormData>& forms,
                    const base::TimeTicks& timestamp);
-  void OnTextFieldDidChange(const webkit::forms::FormData& form,
-                            const webkit::forms::FormField& field,
+  void OnTextFieldDidChange(const chrome::FormData& form,
+                            const chrome::FormField& field,
                             const base::TimeTicks& timestamp);
 
   // The |bounding_box| is a window relative value.
   void OnQueryFormFieldAutofill(int query_id,
-                                const webkit::forms::FormData& form,
-                                const webkit::forms::FormField& field,
+                                const chrome::FormData& form,
+                                const chrome::FormField& field,
                                 const gfx::Rect& bounding_box,
                                 bool display_warning);
   void OnDidEndTextFieldEditing();
   void OnHideAutofillPopup();
   void OnAddPasswordFormMapping(
-      const webkit::forms::FormField& form,
-      const webkit::forms::PasswordFormFillData& fill_data);
-  void OnShowPasswordSuggestions(const webkit::forms::FormField& field,
+      const chrome::FormField& form,
+      const chrome::PasswordFormFillData& fill_data);
+  void OnShowPasswordSuggestions(const chrome::FormField& field,
                                  const gfx::Rect& bounds,
                                  const std::vector<string16>& suggestions);
   void OnSetDataList(const std::vector<string16>& values,
                      const std::vector<string16>& labels,
                      const std::vector<string16>& icons,
                      const std::vector<int>& unique_ids);
 
   // Fills |host| with the RenderViewHost for this tab.
   // Returns false if Autofill is disabled or if the host is unavailable.
   bool GetHost(const std::vector<AutofillProfile*>& profiles,
                const std::vector<CreditCard*>& credit_cards,
                content::RenderViewHost** host) const WARN_UNUSED_RESULT;
 
   // Unpacks |unique_id| and fills |profile| or |credit_card| with the
   // appropriate data source.  Returns false if the unpacked id cannot be found.
   bool GetProfileOrCreditCard(int unique_id,
                               const std::vector<AutofillProfile*>& profiles,
                               const std::vector<CreditCard*>& credit_cards,
                               const AutofillProfile** profile,
                               const CreditCard** credit_card,
                               size_t* variant) const WARN_UNUSED_RESULT;
 
   // Fills |form_structure| cached element corresponding to |form|.
   // Returns false if the cached element was not found.
-  bool FindCachedForm(const webkit::forms::FormData& form,
+  bool FindCachedForm(const chrome::FormData& form,
                       FormStructure** form_structure) const WARN_UNUSED_RESULT;
 
   // Fills |form_structure| and |autofill_field| with the cached elements
   // corresponding to |form| and |field|.  This might have the side-effect of
   // updating the cache.  Returns false if the |form| is not autofillable, or if
   // it is not already present in the cache and the cache is full.
-  bool GetCachedFormAndField(const webkit::forms::FormData& form,
-                             const webkit::forms::FormField& field,
+  bool GetCachedFormAndField(const chrome::FormData& form,
+                             const chrome::FormField& field,
                              FormStructure** form_structure,
                              AutofillField** autofill_field) WARN_UNUSED_RESULT;
 
   // Re-parses |live_form| and adds the result to |form_structures_|.
   // |cached_form| should be a pointer to the existing version of the form, or
   // NULL if no cached version exists.  The updated form is then written into
   // |updated_form|.  Returns false if the cache could not be updated.
-  bool UpdateCachedForm(const webkit::forms::FormData& live_form,
+  bool UpdateCachedForm(const chrome::FormData& live_form,
                         const FormStructure* cached_form,
                         FormStructure** updated_form) WARN_UNUSED_RESULT;
 
   // Returns a list of values from the stored profiles that match |type| and the
   // value of |field| and returns the labels of the matching profiles. |labels|
   // is filled with the Profile label.
   void GetProfileSuggestions(FormStructure* form,
-                             const webkit::forms::FormField& field,
+                             const chrome::FormField& field,
                              AutofillFieldType type,
                              std::vector<string16>* values,
                              std::vector<string16>* labels,
                              std::vector<string16>* icons,
                              std::vector<int>* unique_ids) const;
 
   // Returns a list of values from the stored credit cards that match |type| and
   // the value of |field| and returns the labels of the matching credit cards.
   void GetCreditCardSuggestions(FormStructure* form,
-                                const webkit::forms::FormField& field,
+                                const chrome::FormField& field,
                                 AutofillFieldType type,
                                 std::vector<string16>* values,
                                 std::vector<string16>* labels,
                                 std::vector<string16>* icons,
                                 std::vector<int>* unique_ids) const;
 
   // Set |field|'s value based on |type| and contents of the |credit_card|.
   void FillCreditCardFormField(const CreditCard& credit_card,
                                AutofillFieldType type,
-                               webkit::forms::FormField* field);
+                               chrome::FormField* field);
 
   // Set |field|'s value based on |cached_field|'s type and contents of the
   // |profile|. The |variant| parameter specifies which value in a multi-valued
   // profile.
   void FillFormField(const AutofillProfile& profile,
                      const AutofillField& cached_field,
                      size_t variant,
-                     webkit::forms::FormField* field);
+                     chrome::FormField* field);
 
   // Set |field|'s value for phone number based on contents of the |profile|.
   // The |cached_field| specifies the type of the phone and whether this is a
   // phone prefix or suffix.  The |variant| parameter specifies which value in a
   // multi-valued profile.
   void FillPhoneNumberField(const AutofillProfile& profile,
                             const AutofillField& cached_field,
                             size_t variant,
-                            webkit::forms::FormField* field);
+                            chrome::FormField* field);
 
   // Parses the forms using heuristic matching and querying the Autofill server.
-  void ParseForms(const std::vector<webkit::forms::FormData>& forms);
+  void ParseForms(const std::vector<chrome::FormData>& forms);
 
   // Imports the form data, submitted by the user, into |personal_data_|.
   void ImportFormData(const FormStructure& submitted_form);
 
   // If |initial_interaction_timestamp_| is unset or is set to a later time than
   // |interaction_timestamp|, updates the cached timestamp.  The latter check is
   // needed because IPC messages can arrive out of order.
   void UpdateInitialInteractionTimestamp(
       const base::TimeTicks& interaction_timestamp);
 
@@ skipping 86 matching lines @@
                            TestTabContentsWithExternalDelegate);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest,
                            UserHappinessFormLoadAndSubmission);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, UserHappinessFormInteraction);
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, FormFillDuration);
 
   DISALLOW_COPY_AND_ASSIGN(AutofillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_