diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | android/autofill/url_fetcher_proxy.h | 1 | ||||
| -rw-r--r-- | chrome/browser/autofill/autofill_field.h | 4 | ||||
| -rw-r--r-- | chrome/browser/autofill/autofill_manager.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/autofill/form_structure.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/form_data.h | 4 | ||||
| -rw-r--r-- | webkit/glue/form_field.h | 4 |
7 files changed, 4 insertions, 19 deletions
@@ -408,8 +408,6 @@ LOCAL_C_INCLUDES := \ external/skia \ external/sqlite/dist \ external/webkit/Source/WebKit/chromium \ - external/webkit/Source/WebKit/android \ - external/webkit/Source/WebKit/android/WebCoreSupport \ external/zlib \ external \ $(LOCAL_PATH)/base/third_party/dmg_fp \ diff --git a/android/autofill/url_fetcher_proxy.h b/android/autofill/url_fetcher_proxy.h index 954125f..5649448 100644 --- a/android/autofill/url_fetcher_proxy.h +++ b/android/autofill/url_fetcher_proxy.h @@ -31,7 +31,6 @@ #include "base/threading/thread.h" #include "common/net/url_fetcher.h" #include "net/url_request/url_request_status.h" -#include <WebCoreSupport/autofill/MainThreadProxy.h> class URLFetcherProxy; diff --git a/chrome/browser/autofill/autofill_field.h b/chrome/browser/autofill/autofill_field.h index f14d78e..a875c99 100644 --- a/chrome/browser/autofill/autofill_field.h +++ b/chrome/browser/autofill/autofill_field.h @@ -11,11 +11,7 @@ #include "base/basictypes.h" #include "base/string16.h" #include "chrome/browser/autofill/field_types.h" -#ifdef ANDROID -#include "WebCoreSupport/autofill/FormFieldAndroid.h" -#else #include "webkit/glue/form_field.h" -#endif class AutofillField : public webkit_glue::FormField { public: diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc index aef58d6..1c21c19 100644 --- a/chrome/browser/autofill/autofill_manager.cc +++ b/chrome/browser/autofill/autofill_manager.cc @@ -53,11 +53,7 @@ #endif #include "ui/base/l10n/l10n_util.h" #include "webkit/glue/form_data.h" -#ifdef ANDROID -#include <WebCoreSupport/autofill/FormFieldAndroid.h> -#else #include "webkit/glue/form_field.h" -#endif using webkit_glue::FormData; using webkit_glue::FormField; diff --git a/chrome/browser/autofill/form_structure.cc b/chrome/browser/autofill/form_structure.cc index 1566f17..c4e1e34 100644 --- a/chrome/browser/autofill/form_structure.cc +++ b/chrome/browser/autofill/form_structure.cc @@ -14,11 +14,7 @@ #include "chrome/browser/autofill/field_types.h" #include "chrome/browser/autofill/form_field.h" #include "third_party/libjingle/source/talk/xmllite/xmlelement.h" -#ifdef ANDROID -#include <WebCoreSupport/autofill/FormFieldAndroid.h> -#else #include "webkit/glue/form_field.h" -#endif using webkit_glue::FormData; 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, |