Remove wstring from TableModel....

chrome/browser/ui/views/task_manager_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/task_manager/task_manager.h"
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/command_line.h"
 #include "base/metrics/stats_table.h"
@@ skipping 39 matching lines @@
       : model_(model),
         observer_(NULL) {
     model_->AddObserver(this);
   }
 
   ~TaskManagerTableModel() {
     model_->RemoveObserver(this);
   }
 
   // GroupTableModel.
   int RowCount();

[viettrungluu, 2010/12/29 23:41:17]

Are these OVERRIDEs?

[Avi (use Gerrit), 2010/12/30 00:04:15]

Done.

-  std::wstring GetText(int row, int column);
+  string16 GetText(int row, int column);
   SkBitmap GetIcon(int row);
   void GetGroupRangeForItem(int item, views::GroupRange* range);
   void SetObserver(TableModelObserver* observer);
   virtual int CompareValues(int row1, int row2, int column_id);
 
   // TaskManagerModelObserver.
   virtual void OnModelChanged();
   virtual void OnItemsChanged(int start, int length);
   virtual void OnItemsAdded(int start, int length);
   virtual void OnItemsRemoved(int start, int length);
 
  private:
   TaskManagerModel* model_;
   TableModelObserver* observer_;
 };
 
 int TaskManagerTableModel::RowCount() {
   return model_->ResourceCount();
 }
 
-std::wstring TaskManagerTableModel::GetText(int row, int col_id) {
+string16 TaskManagerTableModel::GetText(int row, int col_id) {
   switch (col_id) {
     case IDS_TASK_MANAGER_PAGE_COLUMN:  // Process
-      return UTF16ToWide(model_->GetResourceTitle(row));
+      return model_->GetResourceTitle(row);
 
     case IDS_TASK_MANAGER_NET_COLUMN:  // Net
-      return UTF16ToWide(model_->GetResourceNetworkUsage(row));
+      return model_->GetResourceNetworkUsage(row);
 
     case IDS_TASK_MANAGER_CPU_COLUMN:  // CPU
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourceCPUUsage(row));
+        return string16();
+      return model_->GetResourceCPUUsage(row);
 
     case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN:  // Memory
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourcePrivateMemory(row));
+        return string16();
+      return model_->GetResourcePrivateMemory(row);
 
     case IDS_TASK_MANAGER_SHARED_MEM_COLUMN:  // Memory
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourceSharedMemory(row));
+        return string16();
+      return model_->GetResourceSharedMemory(row);
 
     case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN:  // Memory
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourcePhysicalMemory(row));
+        return string16();
+      return model_->GetResourcePhysicalMemory(row);
 
     case IDS_TASK_MANAGER_PROCESS_ID_COLUMN:
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourceProcessId(row));
+        return string16();
+      return model_->GetResourceProcessId(row);
 
     case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN:  // Goats Teleported!
-      return UTF16ToWide(model_->GetResourceGoatsTeleported(row));
+      return model_->GetResourceGoatsTeleported(row);
 
     case IDS_TASK_MANAGER_WEBCORE_IMAGE_CACHE_COLUMN:
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourceWebCoreImageCacheSize(row));
+        return string16();
+      return model_->GetResourceWebCoreImageCacheSize(row);
 
     case IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN:
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourceWebCoreScriptsCacheSize(row));
+        return string16();
+      return model_->GetResourceWebCoreScriptsCacheSize(row);
 
     case IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN:
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourceWebCoreCSSCacheSize(row));
+        return string16();
+      return model_->GetResourceWebCoreCSSCacheSize(row);
 
     case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN:
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourceSqliteMemoryUsed(row));
+        return string16();
+      return model_->GetResourceSqliteMemoryUsed(row);
 
     case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN:
       if (!model_->IsResourceFirstInGroup(row))
-        return std::wstring();
-      return UTF16ToWide(model_->GetResourceV8MemoryAllocatedSize(row));
+        return string16();
+      return model_->GetResourceV8MemoryAllocatedSize(row);
 
     default:
       NOTREACHED();
-      return std::wstring();
+      return string16();
   }
 }
 
 SkBitmap TaskManagerTableModel::GetIcon(int row) {
   return model_->GetResourceIcon(row);
 }
 
 
 void TaskManagerTableModel::GetGroupRangeForItem(int item,
                                                  views::GroupRange* range) {
@@ skipping 244 matching lines @@
     int max = stats->GetMaxCounters();
     // skip the first row (it's header data)
     for (int i = 1; i < max; i++) {
       const char* row = stats->GetRowName(i);
       if (row != NULL && row[0] != '\0' && !tab_table_->HasColumn(i)) {
         // TODO(erikkay): Use l10n to get display names for stats.  Right
         // now we're just displaying the internal counter name.  Perhaps
         // stat names not in the string table would be filtered out.
         // TODO(erikkay): Width is hard-coded right now, so many column
         // names are clipped.
-        TableColumn col(i, ASCIIToWide(row), TableColumn::RIGHT, 90, 0);
+        TableColumn col(i, ASCIIToUTF16(row), TableColumn::RIGHT, 90, 0);
         col.sortable = true;
         columns_.push_back(col);
         tab_table_->AddColumn(col);
       }
     }
   }
 }
 
 void TaskManagerView::ViewHierarchyChanged(bool is_add,
                                            views::View* parent,
@@ skipping 273 matching lines @@
 }  // namespace
 
 namespace browser {
 
 // Declared in browser_dialogs.h so others don't need to depend on our header.
 void ShowTaskManager() {
   TaskManagerView::Show();
 }
 
 }  // namespace browser