diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-09 03:32:36 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-09 03:32:36 +0000 |
| commit | 031ffedfe4071b177730c84361b930aed072c09c (patch) | |
| tree | 3065c8052ea5023a91e29a272f0c3afd1c205911 /ui/gfx/canvas_mac.mm | |
| parent | 238083df6afe5e7426ab7ff2553d53f9a4dae562 (diff) | |
| download | chromium_src-031ffedfe4071b177730c84361b930aed072c09c.zip chromium_src-031ffedfe4071b177730c84361b930aed072c09c.tar.gz chromium_src-031ffedfe4071b177730c84361b930aed072c09c.tar.bz2 | |
ui/gfx: Use base::string16 now that string16 was moved into base namespace.
base/string16.h was moved into base namespace in r191198 by Brett.
BUG=None
TBR=ben@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/16051006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/canvas_mac.mm')
| -rw-r--r-- | ui/gfx/canvas_mac.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gfx/canvas_mac.mm b/ui/gfx/canvas_mac.mm index f1ad6a8..a906873 100644 --- a/ui/gfx/canvas_mac.mm +++ b/ui/gfx/canvas_mac.mm @@ -35,7 +35,7 @@ SkTypeface::Style FontTypefaceStyle(const gfx::Font& font) { namespace gfx { // static -void Canvas::SizeStringInt(const string16& text, +void Canvas::SizeStringInt(const base::string16& text, const gfx::Font& font, int* width, int* height, @@ -54,7 +54,7 @@ void Canvas::SizeStringInt(const string16& text, *height = font.GetHeight(); } -void Canvas::DrawStringWithShadows(const string16& text, +void Canvas::DrawStringWithShadows(const base::string16& text, const gfx::Font& font, SkColor color, const gfx::Rect& text_bounds, @@ -72,13 +72,13 @@ void Canvas::DrawStringWithShadows(const string16& text, paint.setTypeface(typeface.get()); paint.setColor(color); canvas_->drawText(text.c_str(), - text.size() * sizeof(string16::value_type), + text.size() * sizeof(base::string16::value_type), text_bounds.x(), text_bounds.bottom(), paint); } -void Canvas::DrawStringWithHalo(const string16& text, +void Canvas::DrawStringWithHalo(const base::string16& text, const gfx::Font& font, SkColor text_color, SkColor halo_color, |