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

Unified Diff: android_webview/native/aw_autofill_manager_delegate.h

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
Index: android_webview/native/aw_autofill_manager_delegate.h
diff --git a/android_webview/native/aw_autofill_manager_delegate.h b/android_webview/native/aw_autofill_manager_delegate.h
index 281364e1378341459ee3f62311faaffb81a84bc2..accc423f9cd20c996e3125f1f996a7eda191ec82 100644
--- a/android_webview/native/aw_autofill_manager_delegate.h
+++ b/android_webview/native/aw_autofill_manager_delegate.h
@@ -74,9 +74,9 @@ class AwAutofillManagerDelegate
virtual void 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) OVERRIDE;
virtual void UpdateAutofillPopupDataListValues(
@@ -95,8 +95,8 @@ class AwAutofillManagerDelegate
friend class content::WebContentsUserData<AwAutofillManagerDelegate>;
void 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);
// The web_contents associated with this delegate.
@@ -105,7 +105,7 @@ class AwAutofillManagerDelegate
JavaObjectWeakGlobalRef java_ref_;
// The current Autofill query values.
- std::vector<string16> values_;
+ std::vector<base::string16> values_;
std::vector<int> identifiers_;
base::WeakPtr<autofill::AutofillPopupDelegate> delegate_;
« no previous file with comments | « android_webview/common/render_view_messages.h ('k') | android_webview/native/aw_autofill_manager_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698