| Index: chrome/browser/resources/task_manager/main.js
|
| diff --git a/chrome/browser/resources/task_manager/main.js b/chrome/browser/resources/task_manager/main.js
|
| index 5df154a73a69e6fd9983d8e05c88c2708c8fa2ab..a4827dee1d7367eab63b7c69f359b3b97c8641f4 100644
|
| --- a/chrome/browser/resources/task_manager/main.js
|
| +++ b/chrome/browser/resources/task_manager/main.js
|
| @@ -319,7 +319,7 @@ TaskManager.prototype = {
|
| this.table_.columnModel = this.columnModel_;
|
|
|
| // Expands height of row when a process has some tasks.
|
| - this.table_.autoExpands = true;
|
| + this.table_.fixedHeight = false;
|
|
|
| this.table_.list.addEventListener('contextmenu',
|
| this.onTableContextMenuOpened_.bind(this),
|
| @@ -353,10 +353,11 @@ TaskManager.prototype = {
|
|
|
| renderColumn_: function(entry, columnId, table) {
|
| var container = this.document_.createElement('div');
|
| - container.id = 'detail-container-' + columnId + '-pid' + entry.processId;
|
| container.className = 'detail-container-' + columnId;
|
|
|
| - if (entry[columnId]) {
|
| + if (entry && entry[columnId]) {
|
| + container.id = 'detail-container-' + columnId + '-pid' + entry.processId;
|
| +
|
| for (var i = 0; i < entry[columnId].length; i++) {
|
| var label = document.createElement('div');
|
| if (columnId == 'title') {
|
| @@ -395,14 +396,20 @@ TaskManager.prototype = {
|
| if (!dm || !sm)
|
| return;
|
|
|
| + this.table_.list.startBatchUpdates();
|
| // Splice takes the to-be-spliced-in array as individual parameters,
|
| // rather than as an array, so we need to perform some acrobatics...
|
| var args = [].slice.call(tasks);
|
| - args.unshift(start, length);
|
| + args.unshift(start, dm.length);
|
|
|
| + sm.beginChange();
|
| var oldSelectedIndexes = sm.selectedIndexes;
|
| +
|
| dm.splice.apply(dm, args);
|
| +
|
| sm.selectedIndexes = oldSelectedIndexes;
|
| + sm.endChange();
|
| + this.table_.list.endBatchUpdates();
|
| },
|
|
|
| onTaskAdd: function (start, length, tasks) {
|
|
|