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

chrome/browser/chromeos/login/user_view.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_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#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/login/rounded_view.h"
 #include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/gtk_util.h"
 #include "gfx/rect.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/background.h"
@@ skipping 49 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::LinkController* link_controller) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::Font& font = rb.GetFont(ResourceBundle::SmallFont);
 
     active_user_label_ = new views::Label(
-        l10n_util::GetString(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::GetString(IDS_SCREEN_LOCK_SIGN_OUT));
+        UTF16ToWide(l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_SIGN_OUT)));
     signout_link_->SetController(link_controller);
     signout_link_->SetFont(font);
     signout_link_->SetColor(kTextColor);
     signout_link_->SetFocusable(true);
 
     AddChildView(active_user_label_);
     AddChildView(signout_link_);
 
     set_background(views::Background::CreateBackgroundPainter(
         true, new SignoutBackgroundPainter()));
@@ skipping 181 matching lines @@
   if (signout_view_) {
     signout_view_->SetBounds(0, kUserImageSize, kUserImageSize,
                              signout_view_->GetPreferredSize().height());
     AddChildView(signout_view_);
   }
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   remove_button_ = new RemoveButton(
       this,
       *rb.GetBitmapNamed(IDR_CLOSE_BAR_H),
-      l10n_util::GetString(IDS_LOGIN_REMOVE),
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)),
       gfx::Point(kUserImageSize - kRemoveButtonPadding, kRemoveButtonPadding));
   remove_button_->SetVisible(false);
   AddChildView(remove_button_);
 }
 
 void UserView::SetImage(const SkBitmap& image, const SkBitmap& image_hot) {
   int desired_size = std::min(image.width(), image.height());
   // Desired size is not preserved if it's greater than 75% of kUserImageSize.
   if (desired_size * 4 > 3 * kUserImageSize)
     desired_size = kUserImageSize;
@@ skipping 29 matching lines @@
   remove_button_->SetVisible(flag);
 }
 
 void UserView::ButtonPressed(views::Button* sender, const views::Event& event) {
   DCHECK(delegate_);
   if (remove_button_ == sender)
     delegate_->OnRemoveUser();
 }
 
 void UserView::OnLocaleChanged() {
-  remove_button_->SetText(l10n_util::GetString(IDS_LOGIN_REMOVE));
+  remove_button_->SetText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)));
 }
 
 }  // namespace chromeos