Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/chromeos/login/username_view.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/login/username_view.h"
 
-#include <algorithm>
-
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/rounded_view.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkColorShader.h"
 #include "third_party/skia/include/core/SkComposeShader.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/rect.h"
 
 namespace chromeos {
 
 namespace {
 // Username label background color.
 const SkColor kLabelBackgoundColor = 0x55000000;
 // Holds margin to height ratio.
 const double kMarginRatio = 1.0 / 3.0;
+// Holds the frame width for the small shaped username view.
+const SkScalar kSmallShapeFrameWidth = SkIntToScalar(1);
+
 }  // namespace
 
 UsernameView::UsernameView(const std::wstring& username, bool use_small_shape)
     : views::Label(username.empty()
-          ? l10n_util::GetStringUTF16(IDS_GUEST) : WideToUTF16Hack(username)),
+          ? UTF16ToWide(l10n_util::GetStringUTF16(IDS_GUEST)) : username),
       use_small_shape_(use_small_shape),
       is_guest_(username.empty()) {
 }
 
 UsernameView::~UsernameView() {}
 
 void UsernameView::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect bounds = GetContentsBounds();
   if (text_image_ == NULL)
     PaintUsername(bounds);
@@ skipping 17 matching lines @@
   margin_width_ = bounds.height() * kMarginRatio;
   gfx::CanvasSkia canvas(bounds.width(), bounds.height(), false);
   // Draw transparent background.
   canvas.drawColor(0);
 
   // Calculate needed space.
   int flags = gfx::Canvas::TEXT_ALIGN_LEFT |
       gfx::Canvas::TEXT_VALIGN_MIDDLE |
       gfx::Canvas::NO_ELLIPSIS;
   int text_height, text_width;
-  gfx::CanvasSkia::SizeStringInt(GetText(), font(),
+  gfx::CanvasSkia::SizeStringInt(WideToUTF16Hack(GetText()), font(),
                                  &text_width, &text_height,
                                  flags);
   text_width += margin_width_;
 
   // Also leave the right margin.
   bool use_fading_for_text = text_width + margin_width_ >= bounds.width();
 
   // Only alpha channel counts.
   SkColor gradient_colors[2];
   gradient_colors[0] = 0xFFFFFFFF;
@@ skipping 24 matching lines @@
 
     SkPaint paint;
     paint.setShader(composite_shader)->unref();
     canvas.drawPaint(paint);
   }
 
   // Draw the text.
   // Note, direct call of the DrawStringInt method produces the green dots
   // along the text perimeter (when the label is place on the white background).
   SkColor kInvisibleHaloColor = 0x00000000;
-  canvas.DrawStringWithHalo(GetText(), font(), GetColor(),
+  canvas.DrawStringWithHalo(WideToUTF16Hack(GetText()), font(), GetColor(),
                             kInvisibleHaloColor, bounds.x() + margin_width_,
                             bounds.y(), bounds.width() - 2 * margin_width_,
                             bounds.height(), flags);
 
   text_image_.reset(new SkBitmap(canvas.ExtractBitmap()));
 
   if (use_fading_for_text) {
     // Fade out only the text in the end. Use regular background.
     canvas.drawColor(kLabelBackgoundColor, SkXfermode::kSrc_Mode);
     SkShader* image_shader = SkShader::CreateBitmapShader(
         *text_image_,
         SkShader::kRepeat_TileMode,
         SkShader::kRepeat_TileMode);
     SkXfermode* mode = SkXfermode::Create(SkXfermode::kSrcIn_Mode);
     SkShader* composite_shader = new SkComposeShader(gradient_shader,
                                                      image_shader, mode);
     gradient_shader->unref();
     image_shader->unref();
 
     SkPaint paint;
     paint.setShader(composite_shader)->unref();
     canvas.drawPaint(paint);
     text_image_.reset(new SkBitmap(canvas.ExtractBitmap()));
   }
 }
 
 void UsernameView::OnLocaleChanged() {
   if (is_guest_) {
-    SetText(l10n_util::GetStringUTF16(IDS_GUEST));
+    SetText(UTF16ToWide(l10n_util::GetStringUTF16(IDS_GUEST)));
   }
   // Repaint because the font may have changed.
   text_image_.reset();
   SchedulePaint();
 }
 
 }  // namespace chromeos