diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-28 11:35:31 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-28 11:41:07 +0100 |
| commit | 4ec1b5c8bfb53483c6105db0656c81740f798f10 (patch) | |
| tree | be606b4e58e1b95a6c9a580a00fb8cb57cfe4500 /webkit | |
| parent | 7e68d3c72ec5667dd697c800feb515a506a2dc9e (diff) | |
| download | external_chromium-4ec1b5c8bfb53483c6105db0656c81740f798f10.zip external_chromium-4ec1b5c8bfb53483c6105db0656c81740f798f10.tar.gz external_chromium-4ec1b5c8bfb53483c6105db0656c81740f798f10.tar.bz2 | |
Preparation for fixing bug 5065047: build libchromium as a shared lib
Use FormField from chromium instead of Android.
Change-Id: I63565da382ea5dd10e7aed57a5a0f47293d160a0
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/form_data.h | 4 | ||||
| -rw-r--r-- | webkit/glue/form_field.h | 4 |
2 files changed, 4 insertions, 4 deletions
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 <vector> #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, |