Commit dcec8e7b authored by yoshiki@chromium.org's avatar yoshiki@chromium.org

WebUI TaskManager: Make the button "End process" grayed on selecting the browser process.

This regression is due to lack of 'type' information of task in task list data from the handler to javascript. This has been caused by http://crrev.com/119052.

BUG=115380
TEST=manual

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124663 0039d316-1c4b-4281-b951-d872f2087c98
parent abd81a52
...@@ -191,8 +191,9 @@ DictionaryValue* CreateTaskGroupValue( ...@@ -191,8 +191,9 @@ DictionaryValue* CreateTaskGroupValue(
val->SetInteger("index", index); val->SetInteger("index", index);
val->SetBoolean("isBackgroundResource", val->SetBoolean("isBackgroundResource",
tm->IsBackgroundResource(index)); tm->IsBackgroundResource(index));
CreateGroupColumnList(tm, "uniqueId", index, length, val);
CreateGroupColumnList(tm, "processId", index, 1, val); CreateGroupColumnList(tm, "processId", index, 1, val);
CreateGroupColumnList(tm, "type", index, length, val);
CreateGroupColumnList(tm, "uniqueId", index, length, val);
for (size_t i = 0; i < arraysize(kColumnsList); ++i) { for (size_t i = 0; i < arraysize(kColumnsList); ++i) {
const std::string column_id = kColumnsList[i].column_id; const std::string column_id = kColumnsList[i].column_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment