diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 19:56:26 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-22 10:12:28 +0000 |
| commit | 773b60fc73d12638ccaf718eeec88ec891c015a8 (patch) | |
| tree | 325ae18ee405b2b0d8cc0cbb9fb3e97766afeb36 /WebKit/android/jni/WebSettings.cpp | |
| parent | dd60d15092d3abe1e3a47faa87386d6e9ea96c30 (diff) | |
| download | external_webkit-773b60fc73d12638ccaf718eeec88ec891c015a8.zip external_webkit-773b60fc73d12638ccaf718eeec88ec891c015a8.tar.gz external_webkit-773b60fc73d12638ccaf718eeec88ec891c015a8.tar.bz2 | |
Merge Chromium at r65505: Update use of AutoFillProfile.
With this new Chromium merge, unique profile ids have been
deprecated and profile previews are obtained through the
Label function rather that PreviewSummary.
WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp:
WebKit/android/jni/WebSettings.cpp:
WebKit/android/WebCoreSupport/autofill/WebAutoFill.h:
http://src.chromium.org/viewvc/chrome?view=rev&revision=63806
http://src.chromium.org/viewvc/chrome?view=rev&revision=65100
Change-Id: I8af86c8be8627e17b13edf66349d9df8f85638a1
Diffstat (limited to 'WebKit/android/jni/WebSettings.cpp')
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index f855307..adee9d8 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -291,6 +291,7 @@ inline string16 getStringFieldAsString16(JNIEnv* env, jobject autoFillProfile, j void syncAutoFillProfile(JNIEnv* env, jobject autoFillProfile, WebAutoFill* webAutoFill) { + // FIXME: id is deprecated. int id = env->GetIntField(autoFillProfile, gFieldIds->mAutoFillProfileUniqueId); string16 fullName = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfileFullName); string16 emailAddress = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfileEmailAddress); @@ -303,7 +304,7 @@ void syncAutoFillProfile(JNIEnv* env, jobject autoFillProfile, WebAutoFill* webA string16 country = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfileCountry); string16 phoneNumber = getStringFieldAsString16(env, autoFillProfile, gFieldIds->mAutoFillProfilePhoneNumber); - webAutoFill->setProfile(id, fullName, emailAddress, companyName, addressLine1, addressLine2, city, state, zipCode, country, phoneNumber); + webAutoFill->setProfile(fullName, emailAddress, companyName, addressLine1, addressLine2, city, state, zipCode, country, phoneNumber); } #endif |