Convert occurrences of WideToUTF{8,16}(l10n_util::GetString...() ...
... to l10n::GetString...UTF{8,16}().
BUG=23581
TEST=builds and tests pass
Review URL: http://codereview.chromium.org/3054052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55371 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/gtk/extension_installed_bubble_gtk.cc
index 37a3c02..e048f1e9 100644
--- a/chrome/browser/gtk/extension_installed_bubble_gtk.cc
+++ b/chrome/browser/gtk/extension_installed_bubble_gtk.cc
@@ -158,9 +158,8 @@
// Heading label
GtkWidget* heading_label = gtk_label_new(NULL);
- std::string heading_text = WideToUTF8(l10n_util::GetStringF(
- IDS_EXTENSION_INSTALLED_HEADING,
- UTF8ToWide(extension_->name())));
+ std::string heading_text = l10n_util::GetStringFUTF8(
+ IDS_EXTENSION_INSTALLED_HEADING, UTF8ToUTF16(extension_->name()));
char* markup = g_markup_printf_escaped("<span size=\"larger\">%s</span>",
heading_text.c_str());
gtk_label_set_markup(GTK_LABEL(heading_label), markup);
@@ -172,9 +171,8 @@
// Page action label
if (type_ == ExtensionInstalledBubbleGtk::PAGE_ACTION) {
- GtkWidget* info_label = gtk_label_new(
- WideToUTF8(l10n_util::GetString(
- IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO)).c_str());
+ GtkWidget* info_label = gtk_label_new(l10n_util::GetStringUTF8(
+ IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO).c_str());
gtk_label_set_line_wrap(GTK_LABEL(info_label), TRUE);
gtk_widget_set_size_request(info_label, kTextColumnWidth, -1);
gtk_box_pack_start(GTK_BOX(text_column), info_label, FALSE, FALSE, 0);
@@ -182,8 +180,8 @@
// Manage label
GtkWidget* manage_label = gtk_label_new(
- WideToUTF8(l10n_util::GetStringF(IDS_EXTENSION_INSTALLED_MANAGE_INFO,
- UTF8ToWide(extension_->name()))).c_str());
+ l10n_util::GetStringFUTF8(IDS_EXTENSION_INSTALLED_MANAGE_INFO,
+ UTF8ToUTF16(extension_->name())).c_str());
gtk_label_set_line_wrap(GTK_LABEL(manage_label), TRUE);
gtk_widget_set_size_request(manage_label, kTextColumnWidth, -1);
gtk_box_pack_start(GTK_BOX(text_column), manage_label, FALSE, FALSE, 0);
