From 4ec1b5c8bfb53483c6105db0656c81740f798f10 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Thu, 28 Jul 2011 11:35:31 +0100 Subject: Preparation for fixing bug 5065047: build libchromium as a shared lib Use FormField from chromium instead of Android. Change-Id: I63565da382ea5dd10e7aed57a5a0f47293d160a0 --- webkit/glue/form_data.h | 4 ---- webkit/glue/form_field.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'webkit') diff --git a/webkit/glue/form_data.h b/webkit/glue/form_data.h index 063b021..f0011c7 100644 --- a/webkit/glue/form_data.h +++ b/webkit/glue/form_data.h @@ -9,11 +9,7 @@ #include "base/string_util.h" #include "googleurl/src/gurl.h" -#ifdef ANDROID -#include "WebCoreSupport/autofill/FormFieldAndroid.h" -#else #include "webkit/glue/form_field.h" -#endif namespace webkit_glue { diff --git a/webkit/glue/form_field.h b/webkit/glue/form_field.h index c246091..f2903fb 100644 --- a/webkit/glue/form_field.h +++ b/webkit/glue/form_field.h @@ -8,14 +8,18 @@ #include #include "base/string16.h" +#ifndef ANDROID #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h" +#endif namespace webkit_glue { // Stores information about a field in a form. struct FormField { FormField(); +#ifndef ANDROID explicit FormField(WebKit::WebFormControlElement element); +#endif FormField(const string16& label, const string16& name, const string16& value, -- cgit v1.1