diff options
Diffstat (limited to 'chrome/browser/views/task_manager_view.cc')
| -rw-r--r-- | chrome/browser/views/task_manager_view.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc index 468562e..bcfb422 100644 --- a/chrome/browser/views/task_manager_view.cc +++ b/chrome/browser/views/task_manager_view.cc @@ -133,6 +133,11 @@ std::wstring TaskManagerTableModel::GetText(int row, int col_id) { return std::wstring(); return model_->GetResourceSqliteMemoryUsed(row); + case IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN: + if (!model_->IsResourceFirstInGroup(row)) + return std::wstring(); + return model_->GetResourceV8MemoryAllocatedSize(row); + default: return model_->GetResourceStatsValue(row, col_id); } @@ -330,6 +335,10 @@ void TaskManagerView::Init() { columns_.push_back(TableColumn(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, TableColumn::RIGHT, -1, 0)); columns_.back().sortable = true; + columns_.push_back( + TableColumn(IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, + TableColumn::RIGHT, -1, 0)); + columns_.back().sortable = true; tab_table_ = new views::GroupTableView(table_model_.get(), columns_, views::ICON_AND_TEXT, false, true, @@ -347,6 +356,8 @@ void TaskManagerView::Init() { false); tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN, false); + tab_table_->SetColumnVisibility( + IDS_TASK_MANAGER_JAVASCRIPT_MEMORY_ALLOCATED_COLUMN, false); tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN, false); |