Revert 71167 - Remove wstring from gfx....

gfx/canvas_skia.h

 // Copyright (c) 2010 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.
 
 #ifndef GFX_CANVAS_SKIA_H_
 #define GFX_CANVAS_SKIA_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/string16.h"
@@ skipping 57 matching lines @@
   void DrawGdkPixbuf(GdkPixbuf* pixbuf, int x, int y);
 #endif
 
 #if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
   // Draws text with a 1-pixel halo around it of the given color.
   // On Windows, it allows ClearType to be drawn to an otherwise transparenct
   //   bitmap for drag images. Drag images have only 1-bit of transparency, so
   //   we don't do any fancy blurring.
   // On Linux, text with halo is created by stroking it with 2px |halo_color|
   //   then filling it with |text_color|.
-  void DrawStringWithHalo(const string16& text,
+  void DrawStringWithHalo(const std::wstring& text,
                           const gfx::Font& font,
                           const SkColor& text_color,
                           const SkColor& halo_color,
                           int x, int y, int w, int h,
                           int flags);
 #endif
 
   // Extracts a bitmap from the contents of this canvas.
   SkBitmap ExtractBitmap() const;
 
@@ skipping 23 matching lines @@
                              const SkPaint& paint);
   virtual void DrawBitmapInt(const SkBitmap& bitmap,
                              int src_x, int src_y, int src_w, int src_h,
                              int dest_x, int dest_y, int dest_w, int dest_h,
                              bool filter);
   virtual void DrawBitmapInt(const SkBitmap& bitmap,
                              int src_x, int src_y, int src_w, int src_h,
                              int dest_x, int dest_y, int dest_w, int dest_h,
                              bool filter,
                              const SkPaint& paint);
-  virtual void DrawStringInt(const string16& text,
+  virtual void DrawStringInt(const std::wstring& text,
                              const gfx::Font& font,
                              const SkColor& color,
                              int x, int y, int w, int h);
-  virtual void DrawStringInt(const string16& text,
+  virtual void DrawStringInt(const std::wstring& text,
                              const gfx::Font& font,
                              const SkColor& color,
                              const gfx::Rect& display_rect);
-  virtual void DrawStringInt(const string16& text,
+  virtual void DrawStringInt(const std::wstring& text,
                              const gfx::Font& font,
                              const SkColor& color,
                              int x, int y, int w, int h,
                              int flags);
   virtual void DrawFocusRect(int x, int y, int width, int height);
   virtual void TileImageInt(const SkBitmap& bitmap, int x, int y, int w, int h);
   virtual void TileImageInt(const SkBitmap& bitmap,
                             int src_x, int src_y,
                             int dest_x, int dest_y, int w, int h);
   virtual gfx::NativeDrawingContext BeginPlatformPaint();
   virtual void EndPlatformPaint();
   virtual CanvasSkia* AsCanvasSkia();
   virtual const CanvasSkia* AsCanvasSkia() const;
 
  private:
   // Test whether the provided rectangle intersects the current clip rect.
   bool IntersectsClipRectInt(int x, int y, int w, int h);
 
 #if defined(OS_WIN)
   // Draws text with the specified color, font and location. The text is
   // aligned to the left, vertically centered, clipped to the region. If the
   // text is too big, it is truncated and '...' is added to the end.
-  void DrawStringInt(const string16& text,
+  void DrawStringInt(const std::wstring& text,
                      HFONT font,
                      const SkColor& color,
                      int x, int y, int w, int h,
                      int flags);
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(CanvasSkia);
 };
 
 }  // namespace gfx;
 
 #endif  // GFX_CANVAS_SKIA_H_