Remove wstring from TableModel....

chrome/browser/gtk/keyword_editor_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/gtk/keyword_editor_view.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
@@ skipping 215 matching lines @@
 void KeywordEditorView::SetColumnValues(int model_row, GtkTreeIter* iter) {
   SkBitmap bitmap = table_model_->GetIcon(model_row);
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
   gtk_list_store_set(
       list_store_, iter,
       COL_FAVICON, pixbuf,
       // Dunno why, even with COL_WEIGHT_SET to FALSE here, the weight still
       // has an effect.  So we just set it to normal.
       COL_WEIGHT, PANGO_WEIGHT_NORMAL,
       COL_WEIGHT_SET, TRUE,
-      COL_TITLE, WideToUTF8(table_model_->GetText(
+      COL_TITLE, UTF16ToUTF8(table_model_->GetText(
           model_row, IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN)).c_str(),
-      COL_KEYWORD, WideToUTF8(table_model_->GetText(
+      COL_KEYWORD, UTF16ToUTF8(table_model_->GetText(
           model_row, IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN)).c_str(),
       -1);
   g_object_unref(pixbuf);
 }
 
 int KeywordEditorView::GetListStoreRowForModelRow(int model_row) const {
   if (model_row < model_second_group_index_)
     return model_row + kFirstGroupRowOffset;
   else
     return model_row + kSecondGroupRowOffset;
@@ skipping 55 matching lines @@
     return;
   }
 
   GtkTreeIter iter;
   // First group title.
   gtk_list_store_append(list_store_, &iter);
   gtk_list_store_set(
       list_store_, &iter,
       COL_WEIGHT, PANGO_WEIGHT_BOLD,
       COL_WEIGHT_SET, TRUE,
-      COL_TITLE, WideToUTF8(groups[0].title).c_str(),
+      COL_TITLE, UTF16ToUTF8(groups[0].title).c_str(),
       COL_IS_HEADER, TRUE,
       -1);
   // First group separator.
   gtk_list_store_append(list_store_, &iter);
   gtk_list_store_set(
       list_store_, &iter,
       COL_IS_HEADER, TRUE,
       COL_IS_SEPARATOR, TRUE,
       -1);
 
   // Blank row between groups.
   gtk_list_store_append(list_store_, &iter);
   gtk_list_store_set(
       list_store_, &iter,
       COL_IS_HEADER, TRUE,
       -1);
   // Second group title.
   gtk_list_store_append(list_store_, &iter);
   gtk_list_store_set(
       list_store_, &iter,
       COL_WEIGHT, PANGO_WEIGHT_BOLD,
       COL_WEIGHT_SET, TRUE,
-      COL_TITLE, WideToUTF8(groups[1].title).c_str(),
+      COL_TITLE, UTF16ToUTF8(groups[1].title).c_str(),
       COL_IS_HEADER, TRUE,
       -1);
   // Second group separator.
   gtk_list_store_append(list_store_, &iter);
   gtk_list_store_set(
       list_store_, &iter,
       COL_IS_HEADER, TRUE,
       COL_IS_SEPARATOR, TRUE,
       -1);
 
@@ skipping 145 matching lines @@
   int model_row = editor->GetSelectedModelRow();
   if (model_row == -1) {
     NOTREACHED();
     return;
   }
   int new_index = editor->controller_->MakeDefaultTemplateURL(model_row);
   if (new_index > 0) {
     editor->SelectModelRow(new_index);
   }
 }