| Index: ui/views/view_text_utils.cc
|
| diff --git a/ui/views/view_text_utils.cc b/ui/views/view_text_utils.cc
|
| index 8bd5e150e14dbd93b0a309655b7366011b634951..0ea27d7624d9c35c09ab5a3af10e7197caa12e98 100644
|
| --- a/ui/views/view_text_utils.cc
|
| +++ b/ui/views/view_text_utils.cc
|
| @@ -111,7 +111,7 @@ void DrawTextStartingFrom(gfx::Canvas* canvas,
|
| word = text; // Draw the whole text at once.
|
|
|
| int w = 0, h = 0;
|
| - gfx::CanvasSkia::SizeStringInt(word, font, &w, &h, flags);
|
| + gfx::Canvas::SizeStringInt(word, font, &w, &h, flags);
|
|
|
| // If we exceed the boundaries, we need to wrap.
|
| WrapIfWordDoesntFit(w, font.GetHeight(), position, bounds);
|
| @@ -123,7 +123,7 @@ void DrawTextStartingFrom(gfx::Canvas* canvas,
|
| // draw the trailing space (if one exists after the LTR text) to the
|
| // left of the LTR string.
|
| if (ltr_within_rtl && word[word.size() - 1] == ' ')
|
| - x += gfx::CanvasSkia::GetStringWidth(ASCIIToUTF16(" "), font);
|
| + x += gfx::Canvas::GetStringWidth(ASCIIToUTF16(" "), font);
|
| }
|
| int y = position->height() + bounds.y();
|
|
|
|
|