Remove JS dialog dependency from content.

chrome/browser/ui/gtk/js_modal_dialog_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/js_modal_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/message_box_flags.h"
 
 namespace {
 
 // We stash pointers to widgets on the gtk_dialog so we can refer to them
 // after dialog creation.
 const char kPromptTextId[] = "chrome_prompt_text";
 const char kSuppressCheckboxId[] = "chrome_suppress_checkbox";
 
 // If there's a text entry in the dialog, get the text from the first one and
 // return it.
-std::wstring GetPromptText(GtkDialog* dialog) {
+string16 GetPromptText(GtkDialog* dialog) {
   GtkWidget* widget = static_cast<GtkWidget*>(
       g_object_get_data(G_OBJECT(dialog), kPromptTextId));
   if (widget)
-    return UTF8ToWide(gtk_entry_get_text(GTK_ENTRY(widget)));
-  return std::wstring();
+    return UTF8ToUTF16(gtk_entry_get_text(GTK_ENTRY(widget)));
+  return string16();
 }
 
 // If there's a toggle button in the dialog, return the toggled state.
 // Otherwise, return false.
 bool ShouldSuppressJSDialogs(GtkDialog* dialog) {
   GtkWidget* widget = static_cast<GtkWidget*>(
       g_object_get_data(G_OBJECT(dialog), kSuppressCheckboxId));
   if (widget)
     return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
   return false;
@@ skipping 37 matching lines @@
     default:
       NOTREACHED();
   }
 
   // We want the alert to be app modal so put all the browser windows into the
   // same window group.
   gtk_util::MakeAppModalWindowGroup();
 
   gtk_dialog_ = gtk_message_dialog_new(parent_window,
       GTK_DIALOG_MODAL, message_type, buttons, "%s",
-      WideToUTF8(dialog_->message_text()).c_str());
+      UTF16ToUTF8(dialog_->message_text()).c_str());
   g_signal_connect(gtk_dialog_, "delete-event",
                    G_CALLBACK(gtk_widget_hide_on_delete), NULL);
   gtk_util::ApplyMessageDialogQuirks(gtk_dialog_);
   gtk_window_set_title(GTK_WINDOW(gtk_dialog_),
-                       WideToUTF8(dialog_->title()).c_str());
+                       UTF16ToUTF8(dialog_->title()).c_str());
 
   // Adjust content area as needed.  Set up the prompt text entry or
   // suppression check box.
   if (ui::MessageBoxFlags::kIsJavascriptPrompt == dialog_->dialog_flags()) {
     // TODO(tc): Replace with gtk_dialog_get_content_area() when using GTK 2.14+
     GtkWidget* contents_vbox = GTK_DIALOG(gtk_dialog_)->vbox;
     GtkWidget* text_box = gtk_entry_new();
     gtk_entry_set_text(GTK_ENTRY(text_box),
-        WideToUTF8(dialog_->default_prompt_text()).c_str());
+        UTF16ToUTF8(dialog_->default_prompt_text()).c_str());
     gtk_box_pack_start(GTK_BOX(contents_vbox), text_box, TRUE, TRUE, 0);
     g_object_set_data(G_OBJECT(gtk_dialog_), kPromptTextId, text_box);
     gtk_entry_set_activates_default(GTK_ENTRY(text_box), TRUE);
   }
 
   if (dialog_->display_suppress_checkbox()) {
     GtkWidget* contents_vbox = GTK_DIALOG(gtk_dialog_)->vbox;
     GtkWidget* check_box = gtk_check_button_new_with_label(
         l10n_util::GetStringUTF8(
         IDS_JAVASCRIPT_MESSAGEBOX_SUPPRESS_OPTION).c_str());
@@ skipping 101 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeAppModalDialog, public:
 
 // static
 NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
     JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent_window) {
   return new JSModalDialogGtk(dialog, parent_window);
 }