diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 22:44:49 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 22:44:49 +0000 |
| commit | 865eb546fe5b899158e031d22189323f49a05d30 (patch) | |
| tree | 209da248691a4ad597c9f27666d503883cdda725 /android_webview/native/aw_autofill_manager_delegate.cc | |
| parent | c6966a8cdc64af37a609576a43e1285e0c18ab11 (diff) | |
| download | chromium_src-865eb546fe5b899158e031d22189323f49a05d30.zip chromium_src-865eb546fe5b899158e031d22189323f49a05d30.tar.gz chromium_src-865eb546fe5b899158e031d22189323f49a05d30.tar.bz2 | |
Add base:: to string16s in android_webview/.
R=benm@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/100453010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native/aw_autofill_manager_delegate.cc')
| -rw-r--r-- | android_webview/native/aw_autofill_manager_delegate.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/android_webview/native/aw_autofill_manager_delegate.cc b/android_webview/native/aw_autofill_manager_delegate.cc index 9be482b..4c731ec 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); |