Convert HtmlDialogUIDelegate::GetDialogTitle() to string16.

chrome/browser/ui/views/html_dialog_view.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/views/html_dialog_view.h"
 
 #include <vector>
 
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/views/window.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/native_web_keyboard_event.h"
 #include "content/common/content_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/events/event.h"
 #include "views/widget/root_view.h"
@@ skipping 74 matching lines @@
 }
 
 bool HtmlDialogView::IsModal() const {
   if (delegate_)
     return delegate_->IsDialogModal();
   return false;
 }
 
 std::wstring HtmlDialogView::GetWindowTitle() const {
   if (delegate_)
-    return delegate_->GetDialogTitle();
+    return UTF16ToWideHack(delegate_->GetDialogTitle());
   return std::wstring();
 }
 
 void HtmlDialogView::WindowClosing() {
   // If we still have a delegate that means we haven't notified it of the
   // dialog closing. This happens if the user clicks the Close button on the
   // dialog.
   if (delegate_) {
     OnWindowClosed();
     OnDialogClosed("");
@@ skipping 20 matching lines @@
   return View::GetWidget();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogUIDelegate implementation:
 
 bool HtmlDialogView::IsDialogModal() const {
   return IsModal();
 }
 
-std::wstring HtmlDialogView::GetDialogTitle() const {
-  return GetWindowTitle();
+string16 HtmlDialogView::GetDialogTitle() const {
+  return WideToUTF16Hack(GetWindowTitle());
 }
 
 GURL HtmlDialogView::GetDialogContentURL() const {
   if (delegate_)
     return delegate_->GetDialogContentURL();
   return GURL();
 }
 
 void HtmlDialogView::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* handlers) const {
@@ skipping 132 matching lines @@
       break;
     default:
       NOTREACHED() << "unknown type" << type;
   }
 }
 
 void HtmlDialogView::RegisterDialogAccelerators() {
   // Pressing the ESC key will close the dialog.
   AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false));
 }