| Index: android_webview/native/aw_contents_client_bridge.h
|
| diff --git a/android_webview/native/aw_contents_client_bridge.h b/android_webview/native/aw_contents_client_bridge.h
|
| index fcb82d515b6eccc24fdb9973851b43bed95bb626..4cd6c6caa130d8c18dbaac68fe876996bad320f1 100644
|
| --- a/android_webview/native/aw_contents_client_bridge.h
|
| +++ b/android_webview/native/aw_contents_client_bridge.h
|
| @@ -43,13 +43,13 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase {
|
| virtual void RunJavaScriptDialog(
|
| content::JavaScriptMessageType message_type,
|
| const GURL& origin_url,
|
| - const string16& message_text,
|
| - const string16& default_prompt_text,
|
| + const base::string16& message_text,
|
| + const base::string16& default_prompt_text,
|
| const content::JavaScriptDialogManager::DialogClosedCallback& callback)
|
| OVERRIDE;
|
| virtual void RunBeforeUnloadDialog(
|
| const GURL& origin_url,
|
| - const string16& message_text,
|
| + const base::string16& message_text,
|
| const content::JavaScriptDialogManager::DialogClosedCallback& callback)
|
| OVERRIDE;
|
| virtual bool ShouldOverrideUrlLoading(const base::string16& url) OVERRIDE;
|
|
|