From e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Wed, 11 Dec 2013 17:51:49 +0000 Subject: Replace some string16's with base namespace in chrome/browser TBR=sky Review URL: https://codereview.chromium.org/101953005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240126 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/android/javascript_app_modal_dialog_android.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'chrome/browser/ui/android/javascript_app_modal_dialog_android.cc') diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc index 2e15b99..5db966c 100644 --- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc +++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc @@ -110,14 +110,15 @@ void JavascriptAppModalDialogAndroid::CloseAppModalDialog() { } void JavascriptAppModalDialogAndroid::AcceptAppModalDialog() { - string16 prompt_text; + base::string16 prompt_text; dialog_->OnAccept(prompt_text, false); delete this; } void JavascriptAppModalDialogAndroid::DidAcceptAppModalDialog( JNIEnv* env, jobject, jstring prompt, bool should_suppress_js_dialogs) { - string16 prompt_text = base::android::ConvertJavaStringToUTF16(env, prompt); + base::string16 prompt_text = + base::android::ConvertJavaStringToUTF16(env, prompt); dialog_->OnAccept(prompt_text, should_suppress_js_dialogs); delete this; } -- cgit v1.1