Index: chrome/browser/ui/views/task_manager_view.cc |
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc |
index 164fa857e19f5725869b5658b0b6f47811bb0c43..00a50d2a5df0ffcfe72f4e44728c24a35718af24 100644 |
--- a/chrome/browser/ui/views/task_manager_view.cc |
+++ b/chrome/browser/ui/views/task_manager_view.cc |
@@ -151,6 +151,9 @@ string16 TaskManagerTableModel::GetText(int row, int col_id) { |
case IDS_TASK_MANAGER_FPS_COLUMN: |
return model_->GetResourceFPS(row); |
+ case IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN: |
+ return model_->GetResourceVideoMemory(row); |
+ |
case IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN: |
if (!model_->IsResourceFirstInGroup(row)) |
return string16(); |
@@ -426,6 +429,8 @@ void TaskManagerView::Init() { |
columns_.back().sortable = true; |
columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_FPS_COLUMN, |
ui::TableColumn::RIGHT, -1, 0)); |
+ columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, |
+ ui::TableColumn::RIGHT, -1, 0)); |
columns_.back().sortable = true; |
columns_.push_back(ui::TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, |
ui::TableColumn::RIGHT, -1, 0)); |
@@ -449,6 +454,8 @@ void TaskManagerView::Init() { |
false); |
tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN, |
false); |
+ tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_VIDEO_MEMORY_COLUMN, |
+ false); |
tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, |
false); |
tab_table_->SetColumnVisibility( |