Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/importing_progress_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/importing_progress_view.h"
 
 #include "app/l10n_util.h"
+#include "base/utf_string_conversions.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/standard_layout.h"
 #include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // ImportingProgressView, public:
 
 ImportingProgressView::ImportingProgressView(const std::wstring& source_name,
                                              int16 items,
                                              ImporterHost* coordinator,
                                              ImportObserver* observer,
                                              HWND parent_window,
                                              bool bookmarks_import)
     : state_bookmarks_(new views::CheckmarkThrobber),
       state_searches_(new views::CheckmarkThrobber),
       state_passwords_(new views::CheckmarkThrobber),
       state_history_(new views::CheckmarkThrobber),
       state_cookies_(new views::CheckmarkThrobber),
-      label_bookmarks_(new views::Label(
-          l10n_util::GetString(IDS_IMPORT_PROGRESS_STATUS_BOOKMARKS))),
-      label_searches_(new views::Label(
-          l10n_util::GetString(IDS_IMPORT_PROGRESS_STATUS_SEARCH))),
-      label_passwords_(new views::Label(
-          l10n_util::GetString(IDS_IMPORT_PROGRESS_STATUS_PASSWORDS))),
-      label_history_(new views::Label(
-          l10n_util::GetString(IDS_IMPORT_PROGRESS_STATUS_HISTORY))),
-      label_cookies_(new views::Label(
-          l10n_util::GetString(IDS_IMPORT_PROGRESS_STATUS_COOKIES))),
+      label_bookmarks_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_BOOKMARKS)))),
+      label_searches_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_SEARCH)))),
+      label_passwords_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_PASSWORDS)))),
+      label_history_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_HISTORY)))),
+      label_cookies_(new views::Label(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_COOKIES)))),
       parent_window_(parent_window),
       coordinator_(coordinator),
       import_observer_(observer),
       items_(items),
       importing_(true),
       bookmarks_import_(bookmarks_import) {
   std::wstring info_text = bookmarks_import ?
-      l10n_util::GetString(IDS_IMPORT_BOOKMARKS) :
-      l10n_util::GetStringF(IDS_IMPORT_PROGRESS_INFO, source_name);
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_BOOKMARKS)) :
+      UTF16ToWide(l10n_util::GetStringFUTF16(
+          IDS_IMPORT_PROGRESS_INFO,
+          WideToUTF16(source_name)));
   label_info_ = new views::Label(info_text);
   coordinator_->SetObserver(this);
   label_info_->SetMultiLine(true);
   label_info_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label_bookmarks_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label_searches_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label_passwords_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label_history_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label_cookies_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
@@ skipping 121 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ImportingProgressView, views::DialogDelegate implementation:
 
 int ImportingProgressView::GetDialogButtons() const {
   return MessageBoxFlags::DIALOGBUTTON_CANCEL;
 }
 
 std::wstring ImportingProgressView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   DCHECK(button == MessageBoxFlags::DIALOGBUTTON_CANCEL);
-  return l10n_util::GetString(IDS_IMPORT_PROGRESS_STATUS_CANCEL);
+  return UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_STATUS_CANCEL));
 }
 
 bool ImportingProgressView::IsModal() const {
   return parent_window_ != NULL;
 }
 
 std::wstring ImportingProgressView::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_IMPORT_PROGRESS_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_PROGRESS_TITLE));
 }
 
 bool ImportingProgressView::Cancel() {
   // When the user cancels the import, we need to tell the coordinator to stop
   // importing and return false so that the window lives long enough to receive
   // ImportEnded, which will close the window. Closing the window results in
   // another call to this function and at that point we must return true to
   // allow the window to close.
   if (!importing_)
     return true;  // We have received ImportEnded, so we can close.
@@ skipping 93 matching lines @@
   views::Window* window =
     views::Window::CreateChromeWindow(parent_window, gfx::Rect(), v);
 
   if (!coordinator->is_headless() && !first_run)
     window->Show();
 
   coordinator->StartImportSettings(source_profile, target_profile, items,
                                    new ProfileWriter(target_profile),
                                    first_run);
 }