| Index: content/shell/browser/shell_javascript_dialog.h
|
| diff --git a/content/shell/browser/shell_javascript_dialog.h b/content/shell/browser/shell_javascript_dialog.h
|
| index 4001334c788fdde535e342b7dc7fe519df247db8..233296bdad2c170eb719180fd7b6ccb35700cd01 100644
|
| --- a/content/shell/browser/shell_javascript_dialog.h
|
| +++ b/content/shell/browser/shell_javascript_dialog.h
|
| @@ -29,8 +29,8 @@ class 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);
|
| ~ShellJavaScriptDialog();
|
|
|
| @@ -46,8 +46,8 @@ class ShellJavaScriptDialog {
|
| #elif defined(OS_WIN)
|
| JavaScriptMessageType message_type_;
|
| HWND dialog_win_;
|
| - string16 message_text_;
|
| - string16 default_prompt_text_;
|
| + base::string16 message_text_;
|
| + base::string16 default_prompt_text_;
|
| static INT_PTR CALLBACK DialogProc(HWND dialog, UINT message, WPARAM wparam,
|
| LPARAM lparam);
|
| #elif defined(TOOLKIT_GTK)
|
|
|