Convert HtmlDialogUIDelegate::GetDialogTitle() to string16.

chrome/browser/ui/gtk/html_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/html_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 53 matching lines @@
 HtmlDialogGtk::~HtmlDialogGtk() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // HtmlDialogUIDelegate implementation:
 
 bool HtmlDialogGtk::IsDialogModal() const {
   return delegate_ ? delegate_->IsDialogModal() : false;
 }
 
-std::wstring HtmlDialogGtk::GetDialogTitle() const {
-  return delegate_ ? delegate_->GetDialogTitle() : L"";
+string16 HtmlDialogGtk::GetDialogTitle() const {
+  return delegate_ ? delegate_->GetDialogTitle() : string16();
 }
 
 GURL HtmlDialogGtk::GetDialogContentURL() const {
   if (delegate_)
     return delegate_->GetDialogContentURL();
   else
     return GURL();
 }
 
 void HtmlDialogGtk::GetWebUIMessageHandlers(
@@ skipping 79 matching lines @@
   HtmlDialogUI::GetPropertyAccessor().SetProperty(
       tab_->tab_contents()->property_bag(), this);
 
   tab_->controller().LoadURL(GetDialogContentURL(),
                              GURL(), PageTransition::START_PAGE);
   GtkDialogFlags flags = GTK_DIALOG_NO_SEPARATOR;
   if (delegate_->IsDialogModal())
     flags = static_cast<GtkDialogFlags>(flags | GTK_DIALOG_MODAL);
 
   dialog_ = gtk_dialog_new_with_buttons(
-      WideToUTF8(delegate_->GetDialogTitle()).c_str(),
+      UTF16ToUTF8(delegate_->GetDialogTitle()).c_str(),
       parent_window_,
       flags,
       NULL);
 
   SetDialogStyle();
   gtk_widget_set_name(dialog_, "chrome-html-dialog");
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
 
   tab_contents_container_.reset(new TabContentsContainerGtk(NULL));
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
                      tab_contents_container_->widget(), TRUE, TRUE, 0);
 
   tab_contents_container_->SetTab(tab_.get());
 
   gfx::Size dialog_size;
   delegate_->GetDialogSize(&dialog_size);
 
   gtk_widget_set_size_request(GTK_WIDGET(tab_contents_container_->widget()),
                               dialog_size.width(),
                               dialog_size.height());
 
   gtk_widget_show_all(dialog_);
 
   return GTK_WINDOW(dialog_);
 }
 
 void HtmlDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
   OnDialogClosed(std::string());
 }