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

chrome/browser/chromeos/login/user_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/user_view.h"
 
-#include <algorithm>
-
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.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"
@@ skipping 48 matching lines @@
 using login::kUserImageSize;
 
 // The view that shows the Sign out button below the user's image.
 class SignoutView : public views::View {
  public:
   explicit SignoutView(views::LinkListener* link_listener) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::Font& font = rb.GetFont(ResourceBundle::SmallFont);
 
     active_user_label_ = new views::Label(
-        l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_ACTIVE_USER));
+        UTF16ToWide(l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_ACTIVE_USER)));
     active_user_label_->SetFont(font);
     active_user_label_->SetColor(kTextColor);
 
     signout_link_ = new views::Link(
-        l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_SIGN_OUT));
+        UTF16ToWide(l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_SIGN_OUT)));
     signout_link_->set_listener(link_listener);
     signout_link_->SetFont(font);
     signout_link_->SetColor(kTextColor);
     signout_link_->set_focusable(true);
     signout_link_->SetHighlightedColor(kTextColor);
     signout_link_->SetDisabledColor(kTextColor);
     signout_link_->SetNormalColor(kTextColor);
     signout_link_->set_id(VIEW_ID_SCREEN_LOCKER_SIGNOUT_LINK);
 
     AddChildView(active_user_label_);
@@ skipping 242 matching lines @@
     delegate_->OnRemoveUser();
 }
 
 void UserView::OnLocaleChanged() {
   remove_button_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)));
   delegate_->OnLocaleChanged();
 }
 
 }  // namespace chromeos