Revert 113772 - WebUI TaskManager: Optimize initialization taskmanager and loading scripts.

chrome/browser/resources/task_manager/main.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /** @constructor */
 function TaskManager() { }
 
 cr.addSingletonGetter(TaskManager);
 
 /*
@@ skipping 127 matching lines @@
    * @public
    */
   initialize: function (dialogDom, opt) {
     if (!dialogDom) {
       console.log('ERROR: dialogDom is not defined.');
       return;
     }
 
     this.opt_ = opt;
 
+    this.initialized_ = true;
     this.enableTaskManager();
 
     this.dialogDom_ = dialogDom;
     this.document_ = dialogDom.ownerDocument;
 
-    var ary = this.dialogDom_.querySelectorAll('[visibleif]');
-    for (var i = 0; i < ary.length; i++) {
-      var expr = ary[i].getAttribute('visibleif');
-      if (!eval(expr))
-        ary[i].hidden = true;
-    }
+    $('close-window').addEventListener('click', this.close.bind(this));
+    $('kill-process').addEventListener('click', this.killProcess.bind(this));
+    $('about-memory-link').addEventListener('click',
+                                            this.openAboutMemory.bind(this));
 
     this.is_column_shown_ = [];
     for (var i = 0; i < DEFAULT_COLUMNS.length; i++) {
       this.is_column_shown_[i] = DEFAULT_COLUMNS[i][3];
     }
 
     this.localized_column_ = [];
     for (var i = 0; i < DEFAULT_COLUMNS.length; i++) {
       var column_label_id = DEFAULT_COLUMNS[i][1];
       var localized_label = localStrings.getString(column_label_id);
@@ skipping 28 matching lines @@
               var aValues = a[value_id];
               var bValues = b[value_id];
               var aValue = aValues && aValues[0] || 0;
               var bvalue = bValues && bValues[0] || 0;
               return dm.defaultValuesCompareFunction(aValue, bvalue);
           };
       }();
       dm.setCompareFunction(column_id, compare_func);
     }
 
+    var ary = this.dialogDom_.querySelectorAll('[visibleif]');
+    for (var i = 0; i < ary.length; i++) {
+      var expr = ary[i].getAttribute('visibleif');
+      if (!eval(expr))
+        ary[i].hidden = true;
+    }
+
     this.initTable_();
-    this.initialized_ = true;
-
-    loadDelayedIncludes(this);
-  },
-
-  /**
-   * Additional initialization of taskmanager. This function is called when
-   * the loading of delayed scripts finished.
-   * @public
-   */
-  delayedInitialize: function () {
-    $('close-window').addEventListener('click', this.close.bind(this));
-    $('kill-process').addEventListener('click', this.killProcess.bind(this));
-    $('about-memory-link').addEventListener('click',
-                                            this.openAboutMemory.bind(this));
     this.initColumnMenu_();
     this.initTableMenu_();
-
-    if (this.delayedInitLabels_) {
-      while (this.delayedInitLabels_.length > 0)
-        this.delayedInitLabels_.pop().call();
-    }
-
-    this.isFinishedInitDelayed_ = true;
+    this.table_.redraw();
   },
 
   initColumnModel_: function () {
     var table_columns = new Array();
     for (var i = 0; i < DEFAULT_COLUMNS.length; i++) {
       if (!this.is_column_shown_[i])
         continue;
 
       var column = DEFAULT_COLUMNS[i];
       table_columns.push(new cr.ui.table.TableColumn(column[0],
@@ skipping 118 matching lines @@
           cm.getRenderFunction(i).call(null, dataItem, cm.getId(i), table));
 
       listItem.appendChild(cell);
     }
     listItem.data = dataItem;
 
     return listItem;
   },
 
   renderColumn_: function(entry, columnId, table) {
-    this.delayedInitLabels_ = [];
-
     var container = this.document_.createElement('div');
     container.className = 'detail-container-' + 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') {
           var image = this.document_.createElement('img');
           image.className = 'detail-title-image';
           image.src = entry['icon'][i];
           label.appendChild(image);
           var text = this.document_.createElement('div');
           text.className = 'detail-title-text';
           text.textContent = entry['title'][i];
           label.appendChild(text);
 
-          var addContextMenu = function() {
-            cr.ui.contextMenuHandler.addContextMenuProperty(label);
-            label.contextMenu = this.tableContextMenu_;
-          };
-
-          if (this.isFinishedInitDelayed_)
-            addContextMenu.call(this);
-          else
-            this.delayedInitLabels_.push(addContextMenu.bind(this));
+          cr.ui.contextMenuHandler.addContextMenuProperty(label);
+          label.contextMenu = this.tableContextMenu_;
 
           label.addEventListener('dblclick', (function(uniqueId) {
               this.activatePage(uniqueId);
           }).bind(this, entry['uniqueId'][i]));
 
           label.data = entry;
           label.index_in_group = i;
         } else {
           label.textContent = entry[columnId][i];
         }
@@ skipping 184 matching lines @@
   taskmanager.onTaskChange(start, length, tasks);
 }
 
 function taskRemoved(start, length) {
   // Sometimes this can get called too early.
   if (!taskmanager)
     return;
   taskmanager.onTaskRemove(start, length);
 }