Index: android_webview/browser/aw_javascript_dialog_manager.h |
diff --git a/android_webview/browser/aw_javascript_dialog_manager.h b/android_webview/browser/aw_javascript_dialog_manager.h |
index f8db746edc35c2d48bf4c0f297644ca17b282050..e43932dd71bd9516bba8beb07cac7b38d1b6450d 100644 |
--- a/android_webview/browser/aw_javascript_dialog_manager.h |
+++ b/android_webview/browser/aw_javascript_dialog_manager.h |
@@ -20,13 +20,13 @@ class AwJavaScriptDialogManager : public content::JavaScriptDialogManager { |
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) OVERRIDE; |
virtual void RunBeforeUnloadDialog( |
content::WebContents* web_contents, |
- const string16& message_text, |
+ const base::string16& message_text, |
bool is_reload, |
const DialogClosedCallback& callback) OVERRIDE; |
virtual void CancelActiveAndPendingDialogs( |