Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3386)

Unified Diff: chrome/browser/ui/gtk/html_dialog_gtk.cc

Issue 7461136: Convert HtmlDialogUIDelegate::GetDialogTitle() to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/html_dialog_gtk.h ('k') | chrome/browser/ui/login/login_prompt_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/browser/ui/gtk/html_dialog_gtk.h ('k') | chrome/browser/ui/login/login_prompt_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698