Disable end process button when Browser process is selected in Task Manager

BUG=chromium-os:20077
TEST=manual

Review URL: http://codereview.chromium.org/8357017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107330 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 0 deletions

diff --git a/chrome/browser/ui/webui/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager_handler.cc
index 1ac7463..1834bdf 100644
--- a/chrome/browser/ui/webui/task_manager_handler.cc
+++ b/chrome/browser/ui/webui/task_manager_handler.cc
@@ -26,6 +26,10 @@ namespace {
 static Value* CreateColumnValue(const TaskManagerModel* tm,
                                 const std::string column_name,
                                 const int i) {
+  if (column_name == "type")
+    return Value::CreateStringValue(
+        TaskManager::Resource::GetResourceTypeAsString(
+        tm->GetResourceType(i)));
   if (column_name == "processId")
     return Value::CreateStringValue(tm->GetResourceProcessId(i));
   if (column_name == "processIdValue")
@@ -152,6 +156,7 @@ static DictionaryValue* CreateTaskGroupValue(const TaskManagerModel* tm,
                   tm->IsBackgroundResource(index));
 
   // Columns which have one datum in each group.
+  CreateGroupColumnList(tm, "type", index, 1, val);
   CreateGroupColumnList(tm, "processId", index, 1, val);
   CreateGroupColumnList(tm, "processIdValue", index, 1, val);
   CreateGroupColumnList(tm, "cpuUsage", index, 1, val);