Remove wstring from TableModel....

chrome/browser/chromeos/options/language_config_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/language_config_view.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 218 matching lines @@
   remove_language_button_->SetEnabled(remove_button_enabled);
 
   // Add the per language config view to the right area.
   right_container_->AddChildView(CreatePerLanguageConfigView(language_code));
   MaybeDisableLastCheckbox();
   // Layout the right container. This is needed for the contents on the
   // right to be displayed properly.
   right_container_->Layout();
 }
 
-std::wstring LanguageConfigView::GetText(int row, int column_id) {
+string16 LanguageConfigView::GetText(int row, int column_id) {
   if (row >= 0 && row < static_cast<int>(
           model_.num_preferred_language_codes())) {
-    return UTF16ToWide(input_method::GetLanguageDisplayNameFromCode(
-        model_.preferred_language_code_at(row)));
+    return input_method::GetLanguageDisplayNameFromCode(
+        model_.preferred_language_code_at(row));
   }
   NOTREACHED();
-  return L"";
+  return string16();
 }
 
 void LanguageConfigView::SetObserver(TableModelObserver* observer) {
   // We don't need the observer for the table mode, since we implement the
   // table model as part of the LanguageConfigView class.
   // http://crbug.com/38266
 }
 
 int LanguageConfigView::RowCount() {
   // Returns the number of rows of the language table.
@@ skipping 149 matching lines @@
 
   // Set up column sets for the grid layout.
   const int kTableColumnSetId = 0;
   ColumnSet* column_set = layout->AddColumnSet(kTableColumnSetId);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   // Create the language table.
   std::vector<TableColumn> columns;
   TableColumn column(0,
-                     l10n_util::GetString(
+                     l10n_util::GetStringUTF16(
                          IDS_OPTIONS_SETTINGS_LANGUAGES_LANGUAGES),
                      TableColumn::LEFT, -1, 0);
   columns.push_back(column);
   // We don't show horizontal and vertical lines.
   const int options = (views::TableView2::SINGLE_SELECTION |
                        views::TableView2::RESIZABLE_COLUMNS |
                        views::TableView2::AUTOSIZE_COLUMNS);
   preferred_language_table_ =
       new views::TableView2(this, columns, views::TEXT_ONLY, options);
   // Set the observer so OnSelectionChanged() will be invoked when a
@@ skipping 194 matching lines @@
 
 void LanguageConfigView::EnableAllCheckboxes() {
   for (std::set<InputMethodCheckbox*>::iterator checkbox =
            input_method_checkboxes_.begin();
        checkbox != input_method_checkboxes_.end(); ++checkbox) {
     (*checkbox)->SetEnabled(true);
   }
 }
 
 }  // namespace chromeos