Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/login_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/views/login_view.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
+#include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/standard_layout.h"
 #include "views/widget/root_view.h"
 
 static const int kMessageWidth = 320;
 static const int kTextfieldStackHorizontalSpacing = 30;
 
 using views::GridLayout;
 
 ///////////////////////////////////////////////////////////////////////////////
 // LoginView, public:
 
 LoginView::LoginView(const std::wstring& explanation,
                      bool focus_view)
     : username_field_(new views::Textfield),
       password_field_(new views::Textfield(views::Textfield::STYLE_PASSWORD)),
-      username_label_(new views::Label(
-          l10n_util::GetString(IDS_LOGIN_DIALOG_USERNAME_FIELD))),
-      password_label_(new views::Label(
-          l10n_util::GetString(IDS_LOGIN_DIALOG_PASSWORD_FIELD))),
+      username_label_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_USERNAME_FIELD)))),
+      password_label_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_LOGIN_DIALOG_PASSWORD_FIELD)))),
       message_label_(new views::Label(explanation)),
       ALLOW_THIS_IN_INITIALIZER_LIST(focus_grabber_factory_(this)),
       login_model_(NULL),
       focus_delayed_(false),
       focus_view_(focus_view) {
   message_label_->SetMultiLine(true);
   message_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   message_label_->SetAllowCharacterBreak(true);
 
   // Initialize the Grid Layout Manager used for this dialog box.
@@ skipping 98 matching lines @@
 
 void LoginView::FocusFirstField() {
   DCHECK(focus_view_);
   if (GetFocusManager()) {
     username_field_->RequestFocus();
   } else {
     // We are invisible - delay until it is no longer the case.
     focus_delayed_ = true;
   }
 }