| Index: chrome/browser/chromeos/login/username_view.cc
|
| diff --git a/chrome/browser/chromeos/login/username_view.cc b/chrome/browser/chromeos/login/username_view.cc
|
| index 750c7883680eb00add33e8f8d21b6ba89b712ad4..efc1976b3a5be62aab010f63f3739e63d941a8f1 100644
|
| --- a/chrome/browser/chromeos/login/username_view.cc
|
| +++ b/chrome/browser/chromeos/login/username_view.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/chromeos/login/username_view.h"
|
|
|
| #include "base/logging.h"
|
| +#include "base/utf_string_conversions.h"
|
| #include "gfx/canvas.h"
|
| #include "gfx/canvas_skia.h"
|
| #include "gfx/rect.h"
|
| @@ -78,7 +79,7 @@ void UsernameView::PaintUsername(const gfx::Rect& bounds) {
|
| gfx::Canvas::TEXT_VALIGN_MIDDLE |
|
| gfx::Canvas::NO_ELLIPSIS;
|
| int text_height;
|
| - gfx::CanvasSkia::SizeStringInt(GetText(), font(),
|
| + gfx::CanvasSkia::SizeStringInt(WideToUTF16Hack(GetText()), font(),
|
| &text_width_, &text_height,
|
| flags);
|
| text_width_ = std::min(text_width_, bounds.width() - margin_width_);
|
|
|