| Index: android_webview/native/aw_autofill_manager_delegate.cc
|
| diff --git a/android_webview/native/aw_autofill_manager_delegate.cc b/android_webview/native/aw_autofill_manager_delegate.cc
|
| index 9be482b914d131388d4bf2175a1a7526d6ee89b7..4c731eca9512c0cfd8a00052a07d1f54e9cc9890 100644
|
| --- a/android_webview/native/aw_autofill_manager_delegate.cc
|
| +++ b/android_webview/native/aw_autofill_manager_delegate.cc
|
| @@ -84,9 +84,9 @@ AwAutofillManagerDelegate::GetDatabase() {
|
| void AwAutofillManagerDelegate::ShowAutofillPopup(
|
| const gfx::RectF& element_bounds,
|
| base::i18n::TextDirection text_direction,
|
| - const std::vector<string16>& values,
|
| - const std::vector<string16>& labels,
|
| - const std::vector<string16>& icons,
|
| + const std::vector<base::string16>& values,
|
| + const std::vector<base::string16>& labels,
|
| + const std::vector<base::string16>& icons,
|
| const std::vector<int>& identifiers,
|
| base::WeakPtr<autofill::AutofillPopupDelegate> delegate) {
|
|
|
| @@ -108,8 +108,8 @@ void AwAutofillManagerDelegate::ShowAutofillPopup(
|
|
|
| void AwAutofillManagerDelegate::ShowAutofillPopupImpl(
|
| const gfx::RectF& element_bounds,
|
| - const std::vector<string16>& values,
|
| - const std::vector<string16>& labels,
|
| + const std::vector<base::string16>& values,
|
| + const std::vector<base::string16>& labels,
|
| const std::vector<int>& identifiers) {
|
| JNIEnv* env = AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
|
|