Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(758)

Unified Diff: android_webview/native/aw_autofill_manager_delegate.cc

Issue 100453010: Add base:: to string16s in android_webview/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/native/aw_autofill_manager_delegate.h ('k') | android_webview/native/aw_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « android_webview/native/aw_autofill_manager_delegate.h ('k') | android_webview/native/aw_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698