Convert instances of WideToUTF8(l10n_util::GetString( to

l10n_util::GetStringUTF8 in the gtk code.  This saves us some string
conversions.

BUG=9688

Review URL: http://codereview.chromium.org/73056


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13719 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 28 insertions, 30 deletions

diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 3d8851a..4a7783c 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -100,7 +100,7 @@ void BookmarkBarGtk::Init(Profile* profile) {
 
   instructions_ =
       gtk_label_new(
-          WideToUTF8(l10n_util::GetString(IDS_BOOKMARKS_NO_ITEMS)).c_str());
+          l10n_util::GetStringUTF8(IDS_BOOKMARKS_NO_ITEMS).c_str());
   gtk_box_pack_start(GTK_BOX(bookmark_hbox_), instructions_,
                      FALSE, FALSE, 0);
 
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index f5301ce..eee898d 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -94,11 +94,11 @@ void BrowserToolbarGtk::Init(Profile* profile,
 
   back_.reset(BuildBackForwardButton(IDR_BACK, IDR_BACK_P, IDR_BACK_H,
               IDR_BACK_D,
-              l10n_util::GetString(IDS_TOOLTIP_BACK)));
+              l10n_util::GetStringUTF8(IDS_TOOLTIP_BACK)));
   AddAcceleratorToButton(back_, GDK_Left, GDK_MOD1_MASK);
   forward_.reset(BuildBackForwardButton(IDR_FORWARD, IDR_FORWARD_P,
                  IDR_FORWARD_H, IDR_FORWARD_D,
-                 l10n_util::GetString(IDS_TOOLTIP_FORWARD)));
+                 l10n_util::GetStringUTF8(IDS_TOOLTIP_FORWARD)));
   AddAcceleratorToButton(forward_, GDK_Right, GDK_MOD1_MASK);
 
   // TODO(estade): These blank labels are kind of ghetto. Padding should be
@@ -107,7 +107,7 @@ void BrowserToolbarGtk::Init(Profile* profile,
   gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0);
 
   reload_.reset(BuildToolbarButton(IDR_RELOAD, IDR_RELOAD_P, IDR_RELOAD_H, 0,
-      l10n_util::GetString(IDS_TOOLTIP_RELOAD)));
+      l10n_util::GetStringUTF8(IDS_TOOLTIP_RELOAD)));
   AddAcceleratorToButton(reload_, GDK_r, GDK_CONTROL_MASK);
   // Any modifier except alt can be combined with f5 (this matches windows
   // chromium).
@@ -120,7 +120,7 @@ void BrowserToolbarGtk::Init(Profile* profile,
 
   gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new("  "), FALSE, FALSE, 0);
 
-  star_.reset(BuildStarButton(l10n_util::GetString(IDS_TOOLTIP_STAR)));
+  star_.reset(BuildStarButton(l10n_util::GetStringUTF8(IDS_TOOLTIP_STAR)));
 
   location_bar_->Init();
   gtk_box_pack_start(GTK_BOX(toolbar_), location_bar_->widget(), TRUE, TRUE, 0);
@@ -131,13 +131,13 @@ void BrowserToolbarGtk::Init(Profile* profile,
   gtk_box_pack_start(GTK_BOX(toolbar_), gtk_label_new(" "), FALSE, FALSE, 0);
 
   BuildToolbarMenuButton(IDR_MENU_PAGE,
-      l10n_util::GetString(IDS_PAGEMENU_TOOLTIP),
+      l10n_util::GetStringUTF8(IDS_PAGEMENU_TOOLTIP),
       &page_menu_button_);
   page_menu_.reset(new MenuGtk(this, GetStandardPageMenu(), accel_group_));
 
   BuildToolbarMenuButton(IDR_MENU_CHROME,
-      l10n_util::GetStringF(IDS_APPMENU_TOOLTIP,
-                            l10n_util::GetString(IDS_PRODUCT_NAME)),
+      l10n_util::GetStringFUTF8(IDS_APPMENU_TOOLTIP,
+          WideToUTF16(l10n_util::GetString(IDS_PRODUCT_NAME))),
       &app_menu_button_);
   app_menu_.reset(new MenuGtk(this, GetStandardAppMenu(), accel_group_));
 
@@ -223,12 +223,12 @@ void BrowserToolbarGtk::UpdateTabContents(TabContents* contents,
 
 CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
     int normal_id, int active_id, int highlight_id, int depressed_id,
-    const std::wstring& localized_tooltip) {
+    const std::string& localized_tooltip) {
   CustomDrawButton* button = new CustomDrawButton(normal_id, active_id,
       highlight_id, depressed_id);
 
   gtk_widget_set_tooltip_text(button->widget(),
-                              WideToUTF8(localized_tooltip).c_str());
+                              localized_tooltip.c_str());
   g_signal_connect(G_OBJECT(button->widget()), "clicked",
                    G_CALLBACK(OnButtonClick), this);
   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
@@ -238,11 +238,11 @@ CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
 }
 
 ToolbarStarToggleGtk* BrowserToolbarGtk::BuildStarButton(
-    const std::wstring& localized_tooltip) {
+    const std::string& localized_tooltip) {
   ToolbarStarToggleGtk* button = new ToolbarStarToggleGtk;
 
   gtk_widget_set_tooltip_text(button->widget(),
-                              WideToUTF8(localized_tooltip).c_str());
+                              localized_tooltip.c_str());
   g_signal_connect(G_OBJECT(button->widget()), "clicked",
                    G_CALLBACK(OnButtonClick), this);
   GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
@@ -253,7 +253,7 @@ ToolbarStarToggleGtk* BrowserToolbarGtk::BuildStarButton(
 
 void BrowserToolbarGtk::BuildToolbarMenuButton(
     int icon_id,
-    const std::wstring& localized_tooltip,
+    const std::string& localized_tooltip,
     OwnedWidgetGtk* owner) {
   GtkWidget* button = gtk_chrome_button_new();
   owner->Own(button);
@@ -263,7 +263,7 @@ void BrowserToolbarGtk::BuildToolbarMenuButton(
   gtk_container_add(GTK_CONTAINER(button),
                     gtk_image_new_from_pixbuf(rb.LoadPixbuf(icon_id)));
 
-  gtk_widget_set_tooltip_text(button, WideToUTF8(localized_tooltip).c_str());
+  gtk_widget_set_tooltip_text(button, localized_tooltip.c_str());
   g_signal_connect(G_OBJECT(button), "button-press-event",
                    G_CALLBACK(OnMenuButtonPressEvent), this);
   GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
@@ -333,12 +333,12 @@ CustomDrawButton* BrowserToolbarGtk::BuildBackForwardButton(
     int active_id,
     int highlight_id,
     int depressed_id,
-    const std::wstring& localized_tooltip) {
+    const std::string& localized_tooltip) {
   CustomDrawButton* button = new CustomDrawButton(normal_id, active_id,
                                                   highlight_id, depressed_id);
 
   gtk_widget_set_tooltip_text(button->widget(),
-                              WideToUTF8(localized_tooltip).c_str());
+                              localized_tooltip.c_str());
 
   g_signal_connect(G_OBJECT(button->widget()), "button-press-event",
                    G_CALLBACK(OnBackForwardPressEvent), this);
@@ -397,7 +397,7 @@ void BrowserToolbarGtk::RunAppMenu(GdkEvent* button_press_event) {
 
 CustomDrawButton* BrowserToolbarGtk::MakeHomeButton() {
   return BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
-                            l10n_util::GetString(IDS_TOOLTIP_HOME));
+                            l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME));
 }
 
 void BrowserToolbarGtk::InitNineBox() {
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h
index dc1b78b1..ccf6dab 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.h
+++ b/chrome/browser/gtk/browser_toolbar_gtk.h
@@ -75,13 +75,13 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
                                        int active_id,
                                        int highlight_id,
                                        int depressed_id,
-                                       const std::wstring& localized_tooltip);
+                                       const std::string& localized_tooltip);
 
-  ToolbarStarToggleGtk* BuildStarButton(const std::wstring& localized_tooltip);
+  ToolbarStarToggleGtk* BuildStarButton(const std::string& localized_tooltip);
 
   void BuildToolbarMenuButton(
       int icon_id,
-      const std::wstring& localized_tooltip,
+      const std::string& localized_tooltip,
       OwnedWidgetGtk* owner);
 
   // Adds a keyboard accelerator which trigers a button. (i.e., Ctrl+R is now
@@ -160,7 +160,7 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
     int active_id,
     int highlight_id,
     int depressed_id,
-    const std::wstring& localized_tooltip);
+    const std::string& localized_tooltip);
 
   // Starts a timer to show the dropdown menu.
   static gboolean OnBackForwardPressEvent(GtkWidget* button,
diff --git a/chrome/browser/gtk/download_shelf_gtk.cc b/chrome/browser/gtk/download_shelf_gtk.cc
index 931f97d..d0071f2 100644
--- a/chrome/browser/gtk/download_shelf_gtk.cc
+++ b/chrome/browser/gtk/download_shelf_gtk.cc
@@ -88,7 +88,7 @@ DownloadShelfGtk::DownloadShelfGtk(TabContents* tab_contents)
 
   // Create the "Show all downloads..." link and connect to the click event.
   std::string link_text =
-      WideToUTF8(l10n_util::GetString(IDS_SHOW_ALL_DOWNLOADS));
+      l10n_util::GetStringUTF8(IDS_SHOW_ALL_DOWNLOADS);
   link_button_.reset(new LinkButtonGtk(link_text.c_str()));
   g_signal_connect(link_button_->widget(), "clicked",
                    G_CALLBACK(OnButtonClick), this);
diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc
index b35a8fd..b7c7845 100644
--- a/chrome/browser/gtk/find_bar_gtk.cc
+++ b/chrome/browser/gtk/find_bar_gtk.cc
@@ -71,15 +71,14 @@ void FindBarGtk::InitWidgets() {
   g_signal_connect(G_OBJECT(close_button_->widget()), "clicked",
                    G_CALLBACK(OnButtonPressed), this);
   gtk_widget_set_tooltip_text(close_button_->widget(),
-      WideToUTF8(l10n_util::GetString(IDS_FIND_IN_PAGE_CLOSE_TOOLTIP)).c_str());
+      l10n_util::GetStringUTF8(IDS_FIND_IN_PAGE_CLOSE_TOOLTIP).c_str());
 
   find_next_button_.reset(new CustomDrawButton(IDR_FINDINPAGE_NEXT,
       IDR_FINDINPAGE_NEXT_H, IDR_FINDINPAGE_NEXT_H, IDR_FINDINPAGE_NEXT_P));
   g_signal_connect(G_OBJECT(find_next_button_->widget()), "clicked",
                    G_CALLBACK(OnButtonPressed), this);
   gtk_widget_set_tooltip_text(find_next_button_->widget(),
-      WideToUTF8(l10n_util::GetString(IDS_FIND_IN_PAGE_NEXT_TOOLTIP))
-          .c_str());
+      l10n_util::GetStringUTF8(IDS_FIND_IN_PAGE_NEXT_TOOLTIP).c_str());
   gtk_box_pack_end(GTK_BOX(hbox), find_next_button_->widget(),
                    FALSE, FALSE, 0);
 
@@ -88,8 +87,7 @@ void FindBarGtk::InitWidgets() {
   g_signal_connect(G_OBJECT(find_previous_button_->widget()), "clicked",
                    G_CALLBACK(OnButtonPressed), this);
   gtk_widget_set_tooltip_text(find_previous_button_->widget(),
-      WideToUTF8(l10n_util::GetString(IDS_FIND_IN_PAGE_PREVIOUS_TOOLTIP))
-          .c_str());
+      l10n_util::GetStringUTF8(IDS_FIND_IN_PAGE_PREVIOUS_TOOLTIP).c_str());
   gtk_box_pack_end(GTK_BOX(hbox), find_previous_button_->widget(),
                    FALSE, FALSE, 0);
 
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index 9ae3765..1a852d5 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -95,11 +95,11 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu,
 
     std::string label;
     if (menu_data->label_argument) {
-      label = WideToUTF8(l10n_util::GetStringF(
+      label = l10n_util::GetStringFUTF8(
           menu_data->label_id,
-          l10n_util::GetString(menu_data->label_argument)));
+          WideToUTF16(l10n_util::GetString(menu_data->label_argument)));
     } else if (menu_data->label_id) {
-      label = WideToUTF8(l10n_util::GetString(menu_data->label_id));
+      label = l10n_util::GetStringUTF8(menu_data->label_id);
     } else if (menu_data->type != MENU_SEPARATOR) {
       label = delegate_->GetLabel(menu_data->id);
       DCHECK(!label.empty());