Remove JS dialog dependency from content.

chrome/browser/ui/app_modal_dialogs/message_box_handler.cc

Index: chrome/browser/ui/app_modal_dialogs/message_box_handler.cc
diff --git a/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc b/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc
index 0de1b9affe486e3553e362b774908d0b68a51f4f..b22a19655da05659825949851c3ec0f83935df8e 100644
--- a/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc
+++ b/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -22,9 +22,11 @@
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 
-static std::wstring GetTitle(Profile* profile,
-                             bool is_alert,
-                             const GURL& frame_url) {
+namespace {
+
+string16 GetTitle(Profile* profile,
+                  bool is_alert,
+                  const GURL& frame_url) {
   ExtensionService* extensions_service = profile->GetExtensionService();
   if (extensions_service) {
     const Extension* extension =
@@ -33,15 +35,15 @@ static std::wstring GetTitle(Profile* profile,
       extension = extensions_service->GetExtensionByWebExtent(frame_url);
 
     if (extension && (extension->location() == Extension::COMPONENT)) {
-      return UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+      return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
     } else if (extension && !extension->name().empty()) {
-      return UTF8ToWide(extension->name());
+      return UTF8ToUTF16(extension->name());
     }
   }
   if (!frame_url.has_host()) {
-    return UTF16ToWideHack(l10n_util::GetStringUTF16(
+    return l10n_util::GetStringUTF16(
         is_alert ? IDS_JAVASCRIPT_ALERT_DEFAULT_TITLE
-                 : IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE));
+                 : IDS_JAVASCRIPT_MESSAGEBOX_DEFAULT_TITLE);
   }
 
   // TODO(brettw) it should be easier than this to do the correct language
@@ -53,39 +55,40 @@ static std::wstring GetTitle(Profile* profile,
   base_address = base::i18n::GetDisplayStringInLTRDirectionality(
       base_address);
 
-  return UTF16ToWide(l10n_util::GetStringFUTF16(
+  return l10n_util::GetStringFUTF16(
       is_alert ? IDS_JAVASCRIPT_ALERT_TITLE :
                  IDS_JAVASCRIPT_MESSAGEBOX_TITLE,
-      base_address));
+      base_address);
 }
 
-void RunJavascriptMessageBox(Profile* profile,
-                             JavaScriptAppModalDialogDelegate* delegate,
+}  // namespace
+
+void RunJavascriptDialogImpl(Profile* profile,
+                             ChromeJavaScriptDialogDelegate* delegate,
                              const GURL& frame_url,
                              int dialog_flags,
-                             const std::wstring& message_text,
-                             const std::wstring& default_prompt_text,
+                             const string16& message_text,
+                             const string16& default_prompt_text,
                              bool display_suppress_checkbox,
                              IPC::Message* reply_msg) {
   bool is_alert = dialog_flags == ui::MessageBoxFlags::kIsJavascriptAlert;
-  std::wstring title = GetTitle(profile, is_alert, frame_url);
+  string16 title = GetTitle(profile, is_alert, frame_url);
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
       delegate, title, dialog_flags, message_text, default_prompt_text,
       display_suppress_checkbox, false, reply_msg));
 }
 
-void RunBeforeUnloadDialog(TabContents* tab_contents,
-                           const std::wstring& message_text,
-                           IPC::Message* reply_msg) {
-  std::wstring full_message = message_text + L"\n\n" + UTF16ToWideHack(
-      l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER));
+void RunBeforeUnloadDialogImpl(ChromeJavaScriptDialogDelegate* delegate,
+                               const string16& message_text,
+                               IPC::Message* reply_msg) {
+  string16 full_message = message_text + ASCIIToUTF16("\n\n") +
+      l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER);
   AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
-      tab_contents,
-      UTF16ToWideHack(
-          l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE)),
+      delegate,
+      l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE),
       ui::MessageBoxFlags::kIsJavascriptConfirm,
-      message_text,
-      std::wstring(),
+      full_message,
+      string16(),
       false,
       true,
       reply_msg));