diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-20 17:39:55 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-28 16:04:55 +0100 |
| commit | cecae02673edd6b4cee88a9b87a61055a91f70bb (patch) | |
| tree | 30b7d086cc75b92cc13a678903da868b29fc2770 /webkit | |
| parent | 4ec1b5c8bfb53483c6105db0656c81740f798f10 (diff) | |
| download | external_chromium-cecae02673edd6b4cee88a9b87a61055a91f70bb.zip external_chromium-cecae02673edd6b4cee88a9b87a61055a91f70bb.tar.gz external_chromium-cecae02673edd6b4cee88a9b87a61055a91f70bb.tar.bz2 | |
Part of fix for 5065047: build libchromium as a shared lib
Linking chromium_net as a static lib.
Needed to update the jni to be handled internally instead
of using the one from webkit it got linked with.
Change-Id: Ia717a29afa879be39835d22faacb6c4810728b53
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/form_field.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/glue/form_field.cc b/webkit/glue/form_field.cc index 0de8446..619d47e 100644 --- a/webkit/glue/form_field.cc +++ b/webkit/glue/form_field.cc @@ -6,16 +6,20 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" +#ifndef ANDROID #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebOptionElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSelectElement.h" +#endif +#ifndef ANDROID using WebKit::WebFormControlElement; using WebKit::WebElement; using WebKit::WebInputElement; using WebKit::WebOptionElement; using WebKit::WebSelectElement; using WebKit::WebVector; +#endif namespace webkit_glue { @@ -24,6 +28,7 @@ FormField::FormField() is_autofilled(false) { } +#ifndef ANDROID // TODO(jhawkins): This constructor should probably be deprecated and the // functionality moved to FormManager. FormField::FormField(WebFormControlElement element) @@ -56,6 +61,7 @@ FormField::FormField(WebFormControlElement element) TrimWhitespace(value, TRIM_LEADING, &value); } +#endif FormField::FormField(const string16& label, const string16& name, |