Remove wstring from l10n_util. Part 8, the last part....

chrome/browser/chromeos/login/user_controller.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
@@ skipping 174 matching lines @@
 void UserController::StartThrobber() {
   throbber_host_->StartThrobber();
 }
 
 void UserController::StopThrobber() {
   throbber_host_->StopThrobber();
 }
 
 std::wstring UserController::GetNameTooltip() const {
   if (is_new_user_)
-    return l10n_util::GetString(IDS_ADD_USER);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_ADD_USER));
   if (is_guest_)
-    return l10n_util::GetString(IDS_GO_INCOGNITO_BUTTON);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_GO_INCOGNITO_BUTTON));
 
   // Tooltip contains user's display name and his email domain to distinguish
   // this user from the other one with the same display name.
   const std::string& email = user_.email();
   size_t at_pos = email.rfind('@');
   if (at_pos == std::string::npos) {
     NOTREACHED();
     return std::wstring();
   }
   size_t domain_start = at_pos + 1;
@@ skipping 200 matching lines @@
 
 WidgetGtk* UserController::CreateLabelWindow(int index,
                                              WmIpcWindowType type) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& font = (type == WM_IPC_WINDOW_LOGIN_LABEL) ?
       rb.GetFont(ResourceBundle::MediumBoldFont) :
       rb.GetFont(ResourceBundle::BaseFont).DeriveFont(
           kUnselectedUsernameFontDelta, gfx::Font::BOLD);
   std::wstring text;
   if (is_guest_) {
-    text = l10n_util::GetString(IDS_GUEST);
+    text = UTF16ToWide(l10n_util::GetStringUTF16(IDS_GUEST));
   } 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::GetString(IDS_ADD_USER);
+      text = UTF16ToWide(l10n_util::GetStringUTF16(IDS_ADD_USER));
   } else {
     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(text, false);
@@ skipping 75 matching lines @@
     return;
   }
   delegate_->RemoveUser(this);
 }
 
 void UserController::SelectUserRelative(int shift) {
   delegate_->SelectUser(user_index() + shift);
 }
 
 }  // namespace chromeos