Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/importer_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/importer_view.h"
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 35 matching lines @@
       initial_state_(initial_state) {
   DCHECK(profile);
   SetupControl();
 }
 
 ImporterView::~ImporterView() {
 }
 
 void ImporterView::SetupControl() {
   // Adds all controls.
-  import_from_label_ =
-      new views::Label(l10n_util::GetString(IDS_IMPORT_FROM_LABEL));
+  import_from_label_ = new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_IMPORT_FROM_LABEL)));
 
   profile_combobox_ = new views::Combobox(this);
   profile_combobox_->set_listener(this);
   profile_combobox_->SetAccessibleName(import_from_label_->GetText());
 
-  import_items_label_ =
-      new views::Label(l10n_util::GetString(IDS_IMPORT_ITEMS_LABEL));
+  import_items_label_ = new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_IMPORT_ITEMS_LABEL)));
 
-  history_checkbox_ =
-      InitCheckbox(l10n_util::GetString(IDS_IMPORT_HISTORY_CHKBOX),
-                   (initial_state_ & importer::HISTORY) != 0);
-  favorites_checkbox_ =
-      InitCheckbox(l10n_util::GetString(IDS_IMPORT_FAVORITES_CHKBOX),
-                   (initial_state_ & importer::FAVORITES) != 0);
-  passwords_checkbox_ =
-      InitCheckbox(l10n_util::GetString(IDS_IMPORT_PASSWORDS_CHKBOX),
-                   (initial_state_ & importer::PASSWORDS) != 0);
-  search_engines_checkbox_ =
-      InitCheckbox(l10n_util::GetString(IDS_IMPORT_SEARCH_ENGINES_CHKBOX),
-                   (initial_state_ & importer::SEARCH_ENGINES) != 0);
+  history_checkbox_ = InitCheckbox(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_HISTORY_CHKBOX)),
+      (initial_state_ & importer::HISTORY) != 0);
+  favorites_checkbox_ = InitCheckbox(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_FAVORITES_CHKBOX)),
+      (initial_state_ & importer::FAVORITES) != 0);
+  passwords_checkbox_ = InitCheckbox(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_PASSWORDS_CHKBOX)),
+      (initial_state_ & importer::PASSWORDS) != 0);
+  search_engines_checkbox_ = InitCheckbox(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_SEARCH_ENGINES_CHKBOX)),
+      (initial_state_ & importer::SEARCH_ENGINES) != 0);
 
   // Arranges controls by using GridLayout.
   const int column_set_id = 0;
   GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
   ColumnSet* column_set = layout->AddColumnSet(column_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
@@ skipping 27 matching lines @@
       IDS_IMPORT_DIALOG_HEIGHT_LINES));
 }
 
 void ImporterView::Layout() {
   GetLayoutManager()->Layout(this);
 }
 
 std::wstring ImporterView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
-    return l10n_util::GetString(IDS_IMPORT_COMMIT);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_COMMIT));
   } else {
     return std::wstring();
   }
 }
 
 bool ImporterView::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
     return history_checkbox_->checked() ||
            favorites_checkbox_->checked() ||
            passwords_checkbox_->checked() ||
            search_engines_checkbox_->checked();
   }
 
   return true;
 }
 
 bool ImporterView::IsModal() const {
   return true;
 }
 
 std::wstring ImporterView::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_IMPORT_SETTINGS_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_IMPORT_SETTINGS_TITLE));
 }
 
 bool ImporterView::Accept() {
   if (!IsDialogButtonEnabled(MessageBoxFlags::DIALOGBUTTON_OK))
     return false;
 
   uint16 items = GetCheckedItems();
 
   int selected_index = profile_combobox_->selected_item();
   StartImportingWithUI(GetWidget()->GetNativeView(), items,
@@ skipping 132 matching lines @@
 
   if (favorites_checkbox_->IsEnabled())
     favorites_checkbox_->SetChecked(!!(items & importer::FAVORITES));
 
   if (passwords_checkbox_->IsEnabled())
     passwords_checkbox_->SetChecked(!!(items & importer::PASSWORDS));
 
   if (search_engines_checkbox_->IsEnabled())
     search_engines_checkbox_->SetChecked(!!(items & importer::SEARCH_ENGINES));
 }