Index: content/shell/browser/shell_javascript_dialog_gtk.cc |
diff --git a/content/shell/browser/shell_javascript_dialog_gtk.cc b/content/shell/browser/shell_javascript_dialog_gtk.cc |
index 87bd6f3124b556096f022142c4902c7ff4d4ff10..65bf7397c1e6f9a3216a13630fea28132b47e6df 100644 |
--- a/content/shell/browser/shell_javascript_dialog_gtk.cc |
+++ b/content/shell/browser/shell_javascript_dialog_gtk.cc |
@@ -19,12 +19,12 @@ const char kPromptTextId[] = "content_shell_prompt_text"; |
// If there's a text entry in the dialog, get the text from the first one and |
// return it. |
-string16 GetPromptText(GtkDialog* dialog) { |
+base::string16 GetPromptText(GtkDialog* dialog) { |
GtkWidget* widget = static_cast<GtkWidget*>( |
g_object_get_data(G_OBJECT(dialog), kPromptTextId)); |
if (widget) |
return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(widget))); |
- return string16(); |
+ return base::string16(); |
} |
} // namespace |
@@ -36,8 +36,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), |
@@ -113,7 +113,7 @@ void ShellJavaScriptDialog::OnResponse(GtkWidget* dialog, int response_id) { |
break; |
case GTK_RESPONSE_CANCEL: |
case GTK_RESPONSE_DELETE_EVENT: |
- callback_.Run(false, string16()); |
+ callback_.Run(false, base::string16()); |
break; |
default: |
NOTREACHED(); |