| Index: chrome/browser/ui/gtk/html_dialog_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.cc b/chrome/browser/ui/gtk/html_dialog_gtk.cc
|
| index 82216b2a24467a730682d9a0589a8ab12608b45b..ec064b068f6af30431adbde61370a06212afab7a 100644
|
| --- a/chrome/browser/ui/gtk/html_dialog_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/html_dialog_gtk.cc
|
| @@ -71,8 +71,8 @@ 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 {
|
| @@ -172,7 +172,7 @@ gfx::NativeWindow HtmlDialogGtk::InitDialog() {
|
| 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);
|
|
|