| 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 ec729308c677e1c591975b799a3b4ec168c3adf6..4ce4a223ac553b106511d2c234b02355c1606953 100644
|
| --- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
|
| +++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
|
| @@ -246,7 +246,7 @@ void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
|
|
|
| // Private methods ------------------------------------------------------------
|
|
|
| -void TestWebViewDelegate::ShowJavaScriptAlert(const string16& message) {
|
| +void TestWebViewDelegate::ShowJavaScriptAlert(const base::string16& message) {
|
| GtkWidget* dialog = gtk_message_dialog_new(
|
| shell_->mainWnd(), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
|
| GTK_BUTTONS_OK, "%s", UTF16ToUTF8(message).c_str());
|
| @@ -255,7 +255,7 @@ void TestWebViewDelegate::ShowJavaScriptAlert(const string16& message) {
|
| gtk_widget_destroy(dialog);
|
| }
|
|
|
| -void TestWebViewDelegate::SetPageTitle(const string16& title) {
|
| +void TestWebViewDelegate::SetPageTitle(const base::string16& title) {
|
| gtk_window_set_title(GTK_WINDOW(shell_->mainWnd()),
|
| ("Test Shell - " + UTF16ToUTF8(title)).c_str());
|
| }
|
|
|