| Index: webkit/tools/test_shell/test_webview_delegate_gtk.cc
|
| diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
|
| index e0e39e84d662cafcc8b9f474fee26c44d26e2f76..61a0e0bfbc061ec8af9f4dfeb9e8c6ea695cdbc7 100644
|
| --- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
|
| +++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
|
| @@ -252,10 +252,10 @@ void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
|
|
|
| // Private methods ------------------------------------------------------------
|
|
|
| -void TestWebViewDelegate::ShowJavaScriptAlert(const std::wstring& message) {
|
| +void TestWebViewDelegate::ShowJavaScriptAlert(const string16& message) {
|
| GtkWidget* dialog = gtk_message_dialog_new(
|
| shell_->mainWnd(), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
|
| - GTK_BUTTONS_OK, "%s", WideToUTF8(message).c_str());
|
| + GTK_BUTTONS_OK, "%s", UTF16ToUTF8(message).c_str());
|
| gtk_window_set_title(GTK_WINDOW(dialog), "JavaScript Alert");
|
| gtk_dialog_run(GTK_DIALOG(dialog)); // Runs a nested message loop.
|
| gtk_widget_destroy(dialog);
|
|
|