Convert infobar APIs to UTF-16.

chrome/browser/gtk/infobar_gtk.cc

 // Copyright (c) 2009 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/gtk/infobar_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/gtk/custom_button.h"
@@ skipping 130 matching lines @@
 
 void InfoBar::Observe(NotificationType type,
                       const NotificationSource& source,
                       const NotificationDetails& details) {
   UpdateBorderColor();
 }
 
 // TODO(joth): This method factors out some common functionality between the
 // various derived infobar classes, however the class hierarchy itself could
 // use refactoring to reduce this duplication. http://crbug.com/38924
-void InfoBar::AddLabelAndLink(const std::wstring& display_text,
-                              const std::wstring& link_text,
+void InfoBar::AddLabelAndLink(const string16& display_text,
+                              const string16& link_text,
                               size_t link_offset,
                               guint link_padding,
                               GCallback callback) {
   GtkWidget* link_button = NULL;
   if (link_text.empty()) {
     // No link text, so skip creating the link and splitting display_text.
     link_offset = std::wstring::npos;
   } else {
     // If we have some link text, create the link button.
-    link_button = gtk_chrome_link_button_new(WideToUTF8(link_text).c_str());
+    link_button = gtk_chrome_link_button_new(UTF16ToUTF8(link_text).c_str());
     gtk_chrome_link_button_set_use_gtk_theme(
         GTK_CHROME_LINK_BUTTON(link_button), FALSE);
     DCHECK(callback);
     g_signal_connect(link_button, "clicked", callback, this);
     gtk_util::SetButtonTriggersNavigation(link_button);
   }
 
   GtkWidget* hbox = gtk_hbox_new(FALSE, 0);
   // We want the link to be horizontally shrinkable, so that the Chrome
   // window can be resized freely even with a very long link.
   gtk_widget_set_size_request(hbox, 0, -1);
   gtk_box_pack_start(GTK_BOX(hbox_), hbox, TRUE, TRUE, 0);
 
   // If link_offset is npos, we right-align the link instead of embedding it
   // in the text.
   if (link_offset == std::wstring::npos) {
     if (link_button)
       gtk_box_pack_end(GTK_BOX(hbox), link_button, FALSE, FALSE, 0);
-    GtkWidget* label = gtk_label_new(WideToUTF8(display_text).c_str());
+    GtkWidget* label = gtk_label_new(UTF16ToUTF8(display_text).c_str());
     // In order to avoid the link_button and the label overlapping with each
     // other, we make the label shrinkable.
     gtk_widget_set_size_request(label, 0, -1);
     gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &gfx::kGdkBlack);
     gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
   } else {
     DCHECK(link_button);
     // Need to insert the link inside the display text.
     GtkWidget* initial_label = gtk_label_new(
-        WideToUTF8(display_text.substr(0, link_offset)).c_str());
+        UTF16ToUTF8(display_text.substr(0, link_offset)).c_str());
     GtkWidget* trailing_label = gtk_label_new(
-        WideToUTF8(display_text.substr(link_offset)).c_str());
+        UTF16ToUTF8(display_text.substr(link_offset)).c_str());
 
     // TODO(joth): Unlike the right-align case above, none of the label widgets
     // are set as shrinkable here, meaning the text will run under the close
     // button etc. when the width is restricted, rather than eliding.
     gtk_widget_modify_fg(initial_label, GTK_STATE_NORMAL, &gfx::kGdkBlack);
     gtk_widget_modify_fg(trailing_label, GTK_STATE_NORMAL, &gfx::kGdkBlack);
 
     // We don't want any spacing between the elements, so we pack them into
     // this hbox that doesn't use kElementPadding.
     gtk_box_pack_start(GTK_BOX(hbox), initial_label, FALSE, FALSE, 0);
@@ skipping 76 matching lines @@
 
   return FALSE;
 }
 
 // AlertInfoBar ----------------------------------------------------------------
 
 class AlertInfoBar : public InfoBar {
  public:
   explicit AlertInfoBar(AlertInfoBarDelegate* delegate)
       : InfoBar(delegate) {
-    AddLabelAndLink(delegate->GetMessageText(), std::wstring(), 0, 0, NULL);
+    AddLabelAndLink(delegate->GetMessageText(), string16(), 0, 0, NULL);
     gtk_widget_show_all(border_bin_.get());
   }
 };
 
 // LinkInfoBar -----------------------------------------------------------------
 
 class LinkInfoBar : public InfoBar {
  public:
   explicit LinkInfoBar(LinkInfoBarDelegate* delegate)
       : InfoBar(delegate) {
     size_t link_offset;
-    std::wstring display_text =
+    string16 display_text =
         delegate->GetMessageTextWithOffset(&link_offset);
-    std::wstring link_text = delegate->GetLinkText();
+    string16 link_text = delegate->GetLinkText();
     AddLabelAndLink(display_text, link_text, link_offset, 0,
                     G_CALLBACK(OnLinkClick));
     gtk_widget_show_all(border_bin_.get());
   }
 
  private:
   static void OnLinkClick(GtkWidget* button, LinkInfoBar* link_info_bar) {
     if (link_info_bar->delegate_->AsLinkInfoBarDelegate()->
         LinkClicked(gtk_util::DispositionForCurrentButtonPressEvent())) {
       link_info_bar->RemoveInfoBar();
     }
   }
 };
 
 // ConfirmInfoBar --------------------------------------------------------------
 
 class ConfirmInfoBar : public InfoBar {
  public:
   explicit ConfirmInfoBar(ConfirmInfoBarDelegate* delegate)
       : InfoBar(delegate) {
     AddConfirmButton(ConfirmInfoBarDelegate::BUTTON_CANCEL);
     AddConfirmButton(ConfirmInfoBarDelegate::BUTTON_OK);
-    std::wstring display_text = delegate->GetMessageText();
-    std::wstring link_text = delegate->GetLinkText();
+    string16 display_text = delegate->GetMessageText();
+    string16 link_text = delegate->GetLinkText();
     AddLabelAndLink(display_text, link_text, display_text.size(),
                     kElementPadding, G_CALLBACK(OnLinkClick));
     gtk_widget_show_all(border_bin_.get());
   }
 
  private:
   // Adds a button to the info bar by type. It will do nothing if the delegate
   // doesn't specify a button of the given type.
   void AddConfirmButton(ConfirmInfoBarDelegate::InfoBarButton type) {
     if (delegate_->AsConfirmInfoBarDelegate()->GetButtons() & type) {
-      GtkWidget* button = gtk_button_new_with_label(WideToUTF8(
+      GtkWidget* button = gtk_button_new_with_label(UTF16ToUTF8(
           delegate_->AsConfirmInfoBarDelegate()->GetButtonLabel(type)).c_str());
       gtk_util::CenterWidgetInHBox(hbox_, button, true, 0);
       g_signal_connect(button, "clicked",
                        G_CALLBACK(type == ConfirmInfoBarDelegate::BUTTON_OK ?
                                   OnOkButton : OnCancelButton),
                        this);
     }
   }
 
   static void OnCancelButton(GtkWidget* button, ConfirmInfoBar* info_bar) {
@@ skipping 24 matching lines @@
 
 InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
   return new LinkInfoBar(this);
 }
 
 // ConfirmInfoBarDelegate, InfoBarDelegate overrides: --------------------------
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   return new ConfirmInfoBar(this);
 }