Convert SizeStringInt from taking a wstring to a string16.

gfx/canvas_skia_linux.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 "gfx/canvas_skia.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ skipping 72 matching lines @@
   }
 
   if (hint_style)
     g_free(hint_style);
   if (rgba_style)
     g_free(rgba_style);
 }
 
 // Pass a width > 0 to force wrapping and elliding.
 static void SetupPangoLayout(PangoLayout* layout,
-                             const std::wstring& text,
+                             const string16& text,
                              const gfx::Font& font,
                              int width,
                              int flags) {
   if (!cairo_font_options)
     UpdateCairoFontOptions();
   // This needs to be done early on; it has no effect when called just before
   // pango_cairo_show_layout().
   pango_cairo_context_set_font_options(
       pango_layout_get_context(layout), cairo_font_options);
 
@@ skipping 29 matching lines @@
   if (resolution > 0) {
     pango_cairo_context_set_resolution(pango_layout_get_context(layout),
                                        resolution);
   }
 
   PangoFontDescription* desc = font.GetNativeFont();
   pango_layout_set_font_description(layout, desc);
   pango_font_description_free(desc);
 
   // Set text and accelerator character if needed.
-  std::string utf8 = WideToUTF8(text);
+  std::string utf8 = UTF16ToUTF8(text);
   if (flags & gfx::Canvas::SHOW_PREFIX) {
     // Escape the text string to be used as markup.
     gchar* escaped_text = g_markup_escape_text(utf8.c_str(), utf8.size());
     pango_layout_set_markup_with_accel(layout,
                                        escaped_text,
                                        strlen(escaped_text),
                                        kAcceleratorChar, NULL);
     g_free(escaped_text);
   } else if (flags & gfx::Canvas::HIDE_PREFIX) {
     // Remove the ampersand character.
@@ skipping 50 matching lines @@
       layout_(NULL),
       text_x_(bounds.x()),
       text_y_(bounds.y()),
       text_width_(0),
       text_height_(0) {
   DCHECK(!bounds_.IsEmpty());
 
   cr_ = canvas_->beginPlatformPaint();
   layout_ = pango_cairo_create_layout(cr_);
 
-  SetupPangoLayout(layout_, text, font, bounds_.width(), flags_);
+  SetupPangoLayout(layout_, WideToUTF16Hack(text), font, bounds_.width(),
+                   flags_);
 
   pango_layout_set_height(layout_, bounds_.height() * PANGO_SCALE);
 
   cairo_save(cr_);
 
   cairo_rectangle(cr_, clip.x(), clip.y(), clip.width(), clip.height());
   cairo_clip(cr_);
 
   pango_layout_get_pixel_size(layout_, &text_width_, &text_height_);
 
@@ skipping 77 matching lines @@
     : skia::PlatformCanvas(width, height, is_opaque) {
 }
 
 CanvasSkia::CanvasSkia() : skia::PlatformCanvas() {
 }
 
 CanvasSkia::~CanvasSkia() {
 }
 
 // static
-void CanvasSkia::SizeStringInt(const std::wstring& text,
+void CanvasSkia::SizeStringInt(const string16& text,
                                const gfx::Font& font,
                                int* width, int* height,
                                int flags) {
   int org_width = *width;
   cairo_surface_t* surface =
       cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
   cairo_t* cr = cairo_create(surface);
   PangoLayout* layout = pango_cairo_create_layout(cr);
 
   SetupPangoLayout(layout, text, font, *width, flags);
@@ skipping 54 matching lines @@
     NOTREACHED();
     return;
   }
 
   cairo_t* cr = beginPlatformPaint();
   gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
   cairo_paint(cr);
 }
 
 }  // namespace gfx