Remove wstring from TableModel....

chrome/browser/ui/views/hung_renderer_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/hung_renderer_dialog.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 30 matching lines @@
 
 class HungPagesTableModel : public views::GroupTableModel {
  public:
   HungPagesTableModel();
   virtual ~HungPagesTableModel();
 
   void InitForTabContents(TabContents* hung_contents);
 
   // Overridden from views::GroupTableModel:
   virtual int RowCount();
-  virtual std::wstring GetText(int row, int column_id);
+  virtual string16 GetText(int row, int column_id);
   virtual SkBitmap GetIcon(int row);
   virtual void SetObserver(TableModelObserver* observer);
   virtual void GetGroupRangeForItem(int item, views::GroupRange* range);
 
  private:
   typedef std::vector<TabContents*> TabContentsVector;
   TabContentsVector tab_contentses_;
 
   TableModelObserver* observer_;
 
@@ skipping 20 matching lines @@
     observer_->OnModelChanged();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungPagesTableModel, views::GroupTableModel implementation:
 
 int HungPagesTableModel::RowCount() {
   return static_cast<int>(tab_contentses_.size());
 }
 
-std::wstring HungPagesTableModel::GetText(int row, int column_id) {
+string16 HungPagesTableModel::GetText(int row, int column_id) {
   DCHECK(row >= 0 && row < RowCount());
-  std::wstring title = UTF16ToWideHack(tab_contentses_[row]->GetTitle());
+  string16 title = tab_contentses_[row]->GetTitle();
   if (title.empty())
-    title = UTF16ToWideHack(TabContents::GetDefaultTitle());
+    title = TabContents::GetDefaultTitle();
   // TODO(xji): Consider adding a special case if the title text is a URL,
   // since those should always have LTR directionality. Please refer to
   // http://crbug.com/6726 for more information.
   base::i18n::AdjustStringForLocaleDirection(&title);
   return title;
 }
 
 SkBitmap HungPagesTableModel::GetIcon(int row) {
   DCHECK(row >= 0 && row < RowCount());
   return tab_contentses_.at(row)->GetFavIcon();
@@ skipping 348 matching lines @@
 }
 
 // static
 void HideForTabContents(TabContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->EndForTabContents(contents);
 }
 
 }  // namespace hung_renderer_dialog