Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/importer_lock_view.cc

 // Copyright (c) 2006-2008 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/importer_lock_view.h"
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/importer/importer.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/label.h"
 #include "views/standard_layout.h"
 #include "views/window/window.h"
 
 // Default size of the dialog window.
 static const int kDefaultWindowWidth = 320;
 static const int kDefaultWindowHeight = 100;
 
 ImporterLockView::ImporterLockView(ImporterHost* host)
     : description_label_(NULL),
       importer_host_(host) {
   description_label_ = new views::Label(
-      l10n_util::GetString(IDS_IMPORTER_LOCK_TEXT));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_TEXT)));
   description_label_->SetMultiLine(true);
   description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(description_label_);
 }
 
 ImporterLockView::~ImporterLockView() {
 }
 
 gfx::Size ImporterLockView::GetPreferredSize() {
   return gfx::Size(views::Window::GetLocalizedContentsSize(
       IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS,
       IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES));
 }
 
 void ImporterLockView::Layout() {
   description_label_->SetBounds(kPanelHorizMargin, kPanelVertMargin,
       width() - 2 * kPanelHorizMargin,
       height() - 2 * kPanelVertMargin);
 }
 
 std::wstring ImporterLockView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
-    return l10n_util::GetString(IDS_IMPORTER_LOCK_OK);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_OK));
   } else if (button == MessageBoxFlags::DIALOGBUTTON_CANCEL) {
-    return l10n_util::GetString(IDS_IMPORTER_LOCK_CANCEL);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_CANCEL));
   }
   return std::wstring();
 }
 
 bool ImporterLockView::IsModal() const {
   return false;
 }
 
 std::wstring ImporterLockView::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_IMPORTER_LOCK_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_TITLE));
 }
 
 bool ImporterLockView::Accept() {
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
       importer_host_, &ImporterHost::OnLockViewEnd, true));
   return true;
 }
 
 bool ImporterLockView::Cancel() {
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
       importer_host_, &ImporterHost::OnLockViewEnd, false));
   return true;
 }
 
 views::View* ImporterLockView::GetContentsView() {
   return this;
 }