Move forms/ out of webkit/.

chrome/browser/autofill/autofill_external_delegate.cc

 // 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.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 24 matching lines @@
 
 void AutofillExternalDelegate::SelectAutofillSuggestionAtIndex(int unique_id) {
   ClearPreviewedForm();
 
   // Only preview the data if it is a profile.
   if (unique_id > 0)
     FillAutofillFormData(unique_id, true);
 }
 
 void AutofillExternalDelegate::OnQuery(int query_id,
-                                       const webkit::forms::FormData& form,
-                                       const webkit::forms::FormField& field,
+                                       const FormData& form,
+                                       const FormFieldData& field,
                                        const gfx::Rect& bounds,
                                        bool display_warning_if_disabled) {
   autofill_query_form_ = form;
   autofill_query_field_ = field;
   display_warning_if_disabled_ = display_warning_if_disabled;
   autofill_query_id_ = query_id;
 
   OnQueryPlatformSpecific(query_id, form, field, bounds);
 }
 
@@ skipping 54 matching lines @@
     ApplyAutofillSuggestions(values, labels, icons, ids);
 
     tab_contents_->autofill_manager()->OnDidShowAutofillSuggestions(
         has_autofill_item && !has_shown_autofill_popup_for_current_edit_);
     has_shown_autofill_popup_for_current_edit_ |= has_autofill_item;
   }
 }
 
 void AutofillExternalDelegate::OnShowPasswordSuggestions(
     const std::vector<string16>& suggestions,
-    const webkit::forms::FormField& field,
+    const FormFieldData& field,
     const gfx::Rect& bounds) {
   autofill_query_field_ = field;
 
   if (suggestions.empty()) {
     HideAutofillPopup();
     return;
   }
 
   SetBounds(bounds);
 
@@ skipping 92 matching lines @@
   HideAutofillPopupInternal();
 }
 
 void AutofillExternalDelegate::Reset() {
   HideAutofillPopup();
 
   password_autofill_manager_.Reset();
 }
 
 void AutofillExternalDelegate::AddPasswordFormMapping(
-      const webkit::forms::FormField& form,
-      const webkit::forms::PasswordFormFillData& fill_data) {
+      const FormFieldData& form,
+      const PasswordFormFillData& fill_data) {
     password_autofill_manager_.AddPasswordFormMapping(form, fill_data);
 }
 
 void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
                                                     bool is_preview) {
   RenderViewHost* host = tab_contents_->web_contents()->GetRenderViewHost();
 
   if (is_preview) {
     host->Send(new AutofillMsg_SetAutofillActionPreview(
         host->GetRoutingID()));
@@ skipping 102 matching lines @@
 
 
 #if defined(OS_MACOSX)
 
 AutofillExternalDelegate* AutofillExternalDelegate::Create(
     TabContents*, AutofillManager*) {
   return NULL;
 }
 
 #endif