| Index: android_webview/browser/aw_javascript_dialog_manager.cc
|
| diff --git a/android_webview/browser/aw_javascript_dialog_manager.cc b/android_webview/browser/aw_javascript_dialog_manager.cc
|
| index 1690eac737267bf783518d26f797a974dfb6f8c3..630c7bfd7af03df9a97e5f78c64ebcf21fbb755f 100644
|
| --- a/android_webview/browser/aw_javascript_dialog_manager.cc
|
| +++ b/android_webview/browser/aw_javascript_dialog_manager.cc
|
| @@ -19,8 +19,8 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog(
|
| const GURL& origin_url,
|
| const std::string& accept_lang,
|
| content::JavaScriptMessageType message_type,
|
| - const string16& message_text,
|
| - const string16& default_prompt_text,
|
| + const base::string16& message_text,
|
| + const base::string16& default_prompt_text,
|
| const DialogClosedCallback& callback,
|
| bool* did_suppress_message) {
|
| AwContentsClientBridgeBase* bridge =
|
| @@ -34,7 +34,7 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog(
|
|
|
| void AwJavaScriptDialogManager::RunBeforeUnloadDialog(
|
| content::WebContents* web_contents,
|
| - const string16& message_text,
|
| + const base::string16& message_text,
|
| bool is_reload,
|
| const DialogClosedCallback& callback) {
|
| AwContentsClientBridgeBase* bridge =
|
|
|