diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 17:51:49 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 17:51:49 +0000 |
| commit | e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545 (patch) | |
| tree | b7596ac00576f552970d869e48f0517448fa70e4 /chrome/browser/ui/android/javascript_app_modal_dialog_android.cc | |
| parent | 6463f823d8a7e915d2ae0f473aabe599c73fdc30 (diff) | |
| download | chromium_src-e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545.zip chromium_src-e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545.tar.gz chromium_src-e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/ui/android/javascript_app_modal_dialog_android.cc')
| -rw-r--r-- | chrome/browser/ui/android/javascript_app_modal_dialog_android.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |