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

chrome/browser/chromeos/options/system_page_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/options/system_page_view.h"
 
 #include <string>
 #include <vector>
 
 #include "app/combobox_model.h"
@@ skipping 174 matching lines @@
       return;
     }
   }
 }
 
 void DateTimeSection::InitContents(GridLayout* layout) {
   timezone_combobox_ = new views::Combobox(&timezone_combobox_model_);
   timezone_combobox_->set_listener(this);
 
   layout->StartRow(0, double_column_view_set_id());
-  layout->AddView(new views::Label(
-      l10n_util::GetString(IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION)));
+  layout->AddView(new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_TIMEZONE_DESCRIPTION))));
   layout->AddView(timezone_combobox_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   TimezoneChanged(CrosLibrary::Get()->GetSystemLibrary()->GetTimezone());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchpadSection
 
 class TouchpadSection : public SettingsPageSection,
@@ skipping 51 matching lines @@
   if (sender == sensitivity_slider_) {
     double value = sensitivity_slider_->value();
     UserMetricsRecordAction(
         UserMetricsAction("Options_SensitivitySlider_Changed"),
         profile()->GetPrefs());
     sensitivity_.SetValue(value);
   }
 }
 
 void TouchpadSection::InitContents(GridLayout* layout) {
-  enable_tap_to_click_checkbox_ = new views::Checkbox(l10n_util::GetString(
-      IDS_OPTIONS_SETTINGS_TAP_TO_CLICK_ENABLED_DESCRIPTION));
+  enable_tap_to_click_checkbox_ =
+      new views::Checkbox(UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_TAP_TO_CLICK_ENABLED_DESCRIPTION)));
   enable_tap_to_click_checkbox_->set_listener(this);
   enable_tap_to_click_checkbox_->SetMultiLine(true);
   // Create sensitivity slider with values between 1 and 5 step 1
   sensitivity_slider_ = new views::Slider(1, 5, 1,
       static_cast<views::Slider::StyleFlags>(
           views::Slider::STYLE_DRAW_VALUE |
           views::Slider::STYLE_UPDATE_ON_RELEASE),
       this);
 
   layout->StartRow(0, double_column_view_set_id());
-  layout->AddView(new views::Label(
-      l10n_util::GetString(IDS_OPTIONS_SETTINGS_SENSITIVITY_DESCRIPTION)));
+  layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_SENSITIVITY_DESCRIPTION))));
   layout->AddView(sensitivity_slider_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id());
   layout->AddView(enable_tap_to_click_checkbox_);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
   // Init member prefs so we can update the controls if prefs change.
   tap_to_click_enabled_.Init(prefs::kTapToClickEnabled,
                              profile()->GetPrefs(), this);
   sensitivity_.Init(prefs::kTouchpadSensitivity,
@@ skipping 60 matching lines @@
       prefs::kLanguageXkbRemapControlKeyTo, profile->GetPrefs(), this);
   xkb_remap_alt_key_pref_.Init(
       prefs::kLanguageXkbRemapAltKeyTo, profile->GetPrefs(), this);
 }
 
 void LanguageSection::InitContents(GridLayout* layout) {
   // Add the customize button and XKB combobox.
   layout->StartRow(0, double_column_view_set_id());
   views::NativeButton* customize_languages_button = new views::NativeButton(
       this,
-      l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE));
+      UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE)));
   customize_languages_button->set_tag(kCustomizeLanguagesButton);
 
   xkb_modifier_combobox_ = new views::Combobox(&xkb_modifier_combobox_model_);
   xkb_modifier_combobox_->set_listener(this);
 
   // Initialize the combobox to what's saved in user preferences. Otherwise,
   // ItemChanged() will be called with |new_index| == 0.
   NotifyPrefChanged(NULL);
 
   layout->AddView(customize_languages_button, 1, 1,
@@ skipping 94 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(AccessibilitySection);
 };
 
 AccessibilitySection::AccessibilitySection(Profile* profile)
     : SettingsPageSection(profile,
                           IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY),
       accessibility_checkbox_(NULL) {
 }
 
 void AccessibilitySection::InitContents(GridLayout* layout) {
-  accessibility_checkbox_ = new views::Checkbox(l10n_util::GetString(
-      IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION));
+  accessibility_checkbox_ =
+      new views::Checkbox(UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION)));
   accessibility_checkbox_->set_listener(this);
   accessibility_checkbox_->SetMultiLine(true);
 
   layout->StartRow(0, double_column_view_set_id());
   layout->AddView(accessibility_checkbox_);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
   // Init member prefs so we can update the controls if prefs change.
   accessibility_enabled_.Init(prefs::kAccessibilityEnabled,
       profile()->GetPrefs(), this);
@@ skipping 38 matching lines @@
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new LanguageSection(profile()));
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new AccessibilitySection(profile()));
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }
 
 }  // namespace chromeos