diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-20 11:35:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-20 11:35:44 -0700 |
| commit | 8dfd5f6473f3130a2cba0742b0d16ad3d10106be (patch) | |
| tree | 7b40fee94f5093d4f42e05c7a5abb3c2343ea3ef /WebKit/android/WebCoreSupport | |
| parent | 70b68350b01ef7101e3dcdab2a3544a56b6e3b62 (diff) | |
| parent | f1b7fe47bddde1b9a0a1646dc2f1f78705169e05 (diff) | |
| download | external_webkit-8dfd5f6473f3130a2cba0742b0d16ad3d10106be.zip external_webkit-8dfd5f6473f3130a2cba0742b0d16ad3d10106be.tar.gz external_webkit-8dfd5f6473f3130a2cba0742b0d16ad3d10106be.tar.bz2 | |
Merge "Fix AutoFill after merge to Chromium merge to 7.0.540.0"
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp | 7 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/autofill/WebAutoFill.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp index 157a58a..ed42c7a 100644 --- a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp +++ b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp @@ -162,11 +162,12 @@ bool WebAutoFill::enabled() const return page ? page->settings()->autoFillEnabled() : false; } -void WebAutoFill::setProfile(const string16& fullName, const string16& emailAddress, const string16& companyName, const string16& addressLine1, - const string16& addressLine2, const string16& city, const string16& state, const string16& zipCode, - const string16& country, const string16& phoneNumber) +void WebAutoFill::setProfile(int id, const string16& fullName, const string16& emailAddress, const string16& companyName, + const string16& addressLine1, const string16& addressLine2, const string16& city, + const string16& state, const string16& zipCode, const string16& country, const string16& phoneNumber) { AutoFillProfile autoFillProfile; + autoFillProfile.set_unique_id(id); // Constants for AutoFill field types are found in external/chromium/chrome/browser/autofill/field_types.h. autoFillProfile.SetInfo(AutoFillType(NAME_FULL), fullName); diff --git a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h index f5b2c68..46850e6 100644 --- a/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h +++ b/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h @@ -63,9 +63,9 @@ public: void setWebViewCore(WebViewCore* webViewCore) { mWebViewCore = webViewCore; } bool enabled() const; - void setProfile(const string16& fullName, const string16& emailAddress, const string16& companyName, const string16& addressLine1, - const string16& addressLine2, const string16& city, const string16& state, const string16& zipCode, - const string16& country, const string16& phoneNumber); + void setProfile(int id, const string16& fullName, const string16& emailAddress, const string16& companyName, + const string16& addressLine1, const string16& addressLine2, const string16& city, + const string16& state, const string16& zipCode, const string16& country, const string16& phoneNumber); private: OwnPtr<FormManager> mFormManager; |