| Index: content/shell/browser/shell_javascript_dialog_mac.mm
|
| diff --git a/content/shell/browser/shell_javascript_dialog_mac.mm b/content/shell/browser/shell_javascript_dialog_mac.mm
|
| index fe9de98d3555efdcbe9a6f8bfd16fc043095aecf..e74800038360f409d0a8853ac80d6978e819dc85 100644
|
| --- a/content/shell/browser/shell_javascript_dialog_mac.mm
|
| +++ b/content/shell/browser/shell_javascript_dialog_mac.mm
|
| @@ -66,7 +66,7 @@
|
| return;
|
|
|
| bool success = returnCode == NSAlertFirstButtonReturn;
|
| - string16 input;
|
| + base::string16 input;
|
| if (textField_)
|
| input = base::SysNSStringToUTF16([textField_ stringValue]);
|
|
|
| @@ -89,8 +89,8 @@ ShellJavaScriptDialog::ShellJavaScriptDialog(
|
| ShellJavaScriptDialogManager* manager,
|
| gfx::NativeWindow parent_window,
|
| JavaScriptMessageType message_type,
|
| - const string16& message_text,
|
| - const string16& default_prompt_text,
|
| + const base::string16& message_text,
|
| + const base::string16& default_prompt_text,
|
| const JavaScriptDialogManager::DialogClosedCallback& callback)
|
| : manager_(manager),
|
| callback_(callback) {
|
|
|