Remove wstring from TableModel....

views/controls/table/native_table_gtk.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 "views/controls/table/native_table_gtk.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 260 matching lines @@
   // Updates the gtk model with the actual model.
   if (table_->model())
     OnRowsAdded(0, table_->model()->RowCount());
 
   gtk_widget_show_all(native_view());
 }
 
 void NativeTableGtk::InsertTextColumn(const TableColumn& column, int index) {
   GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_insert_column_with_attributes(tree_view_, -1,
-                                              WideToUTF8(column.title).c_str(),
+                                              UTF16ToUTF8(column.title).c_str(),
                                               renderer, "text", index, NULL);
 }
 
 void NativeTableGtk::InsertIconAndTextColumn(const TableColumn& column,
                                              int index) {
   // If necessary we could support more than 1 icon and text column and we could
   // make it so it does not have to be the 1st column.
   DCHECK_EQ(0, index) << "The icon and text column can only be the first column"
       " at this point.";
 
   GtkTreeViewColumn* gtk_column = gtk_tree_view_column_new();
-  gtk_tree_view_column_set_title(gtk_column, WideToUTF8(column.title).c_str());
+  gtk_tree_view_column_set_title(gtk_column, UTF16ToUTF8(column.title).c_str());
   GtkCellRenderer* renderer = gtk_cell_renderer_pixbuf_new();
   gtk_tree_view_column_pack_start(gtk_column, renderer, FALSE);
   // First we set the icon renderer at index 0.
   gtk_tree_view_column_set_attributes(gtk_column, renderer, "pixbuf", 0, NULL);
 
   renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_column_pack_start(gtk_column, renderer, TRUE);
   // Then we set the text renderer at index 1.
   gtk_tree_view_column_set_attributes(gtk_column, renderer, "text", 1, NULL);
 
   gtk_tree_view_append_column(tree_view_, gtk_column);
 }
 
 void NativeTableGtk::SetRowData(int row_index, GtkTreeIter* iter) {
   int gtk_column_index = 0;
   if (table_->type() == ICON_AND_TEXT) {
     GdkPixbuf* icon = GetModelIcon(row_index);
     gtk_list_store_set(gtk_model_, iter, 0, icon, -1);
     g_object_unref(icon);
     gtk_column_index++;
   }
   for (size_t i = 0; i < table_->GetVisibleColumnCount();
        ++i, ++gtk_column_index) {
     std::string text =
-        WideToUTF8(table_->model()->GetText(row_index,
-                                            table_->GetVisibleColumnAt(i).id));
+        UTF16ToUTF8(table_->model()->GetText(row_index,
+                                             table_->GetVisibleColumnAt(i).id));
     gtk_list_store_set(gtk_model_, iter, gtk_column_index, text.c_str(), -1);
   }
 }
 
 void NativeTableGtk::OnCursorChanged(GtkWidget* widget) {
   // Ignore the signal if no row is selected. This can occur when GTK
   // first opens a window (i.e. no row is selected but the cursor is set
   // to the first row). When a user clicks on a row, the row is selected,
   // and then "cursor-changed" signal is emitted, hence the selection
   // count will be 1 here.
@@ skipping 14 matching lines @@
   SkBitmap icon = table_->model()->GetIcon(row);
   return gfx::GdkPixbufFromSkBitmap(&icon);
 }
 
 // static
 NativeTableWrapper* NativeTableWrapper::CreateNativeWrapper(TableView2* table) {
   return new NativeTableGtk(table);
 }
 
 }  // namespace views