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

chrome/browser/chromeos/login/user_controller.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_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
@@ skipping 441 matching lines @@
   }
   UpdateUserCount(index, total_user_count);
 
   GdkWindow* gdk_window = border_window_->GetNativeView()->window;
   gdk_window_set_back_pixmap(gdk_window, NULL, false);
 
   border_window_->Show();
 }
 
 Widget* UserController::CreateLabelWidget(int index, WmIpcWindowType type) {
-  string16 text;
+  std::wstring text;
   if (is_guest_) {
-    text = string16();
+    text = std::wstring();
   } else if (is_new_user_) {
     // Add user should have label only in activated state.
     // When new user is the only, label is not needed.
     if (type == WM_IPC_WINDOW_LOGIN_LABEL && index != 0)
-      text = l10n_util::GetStringUTF16(IDS_ADD_USER);
+      text = UTF16ToWide(l10n_util::GetStringUTF16(IDS_ADD_USER));
   } else {
-    text = UTF8ToUTF16(user_.GetDisplayName());
+    text = UTF8ToWide(user_.GetDisplayName());
   }
 
   views::Label* label = NULL;
 
   if (is_new_user_) {
     label = new views::Label(text);
   } else if (type == WM_IPC_WINDOW_LOGIN_LABEL) {
-    label = UsernameView::CreateShapedUsernameView(UTF16ToWide(text), false);
+    label = UsernameView::CreateShapedUsernameView(text, false);
   } else {
     DCHECK(type == WM_IPC_WINDOW_LOGIN_UNSELECTED_LABEL);
     // TODO(altimofeev): switch to the rounded username view.
-    label = UsernameView::CreateShapedUsernameView(
-        UTF16ToWideHack(text), true);
+    label = UsernameView::CreateShapedUsernameView(text, true);
   }
 
   const gfx::Font& font = (type == WM_IPC_WINDOW_LOGIN_LABEL) ?
       GetLabelFont() : GetUnselectedLabelFont();
   label->SetFont(font);
   label->SetColor(login::kTextColor);
 
   if (type == WM_IPC_WINDOW_LOGIN_LABEL)
     label_view_ = label;
   else
@@ skipping 28 matching lines @@
 string16 UserController::GetNameTooltip() const {
   if (is_new_user_)
     return l10n_util::GetStringUTF16(IDS_ADD_USER);
   else if (is_guest_)
     return l10n_util::GetStringUTF16(IDS_GO_INCOGNITO_BUTTON);
   else
     return UTF8ToUTF16(user_.GetNameTooltip());
 }
 
 }  // namespace chromeos