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

chrome/browser/resources/task_manager/main.js

Index: chrome/browser/resources/task_manager/main.js
===================================================================
--- chrome/browser/resources/task_manager/main.js	(revision 113775)
+++ chrome/browser/resources/task_manager/main.js	(working copy)
@@ -145,17 +145,16 @@
 
     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++) {
@@ -204,31 +203,17 @@
       dm.setCompareFunction(column_id, compare_func);
     }
 
-    this.initTable_();
-    this.initialized_ = true;
+    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;
+    }
 
-    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.initTable_();
     this.initColumnMenu_();
     this.initTableMenu_();
-
-    if (this.delayedInitLabels_) {
-      while (this.delayedInitLabels_.length > 0)
-        this.delayedInitLabels_.pop().call();
-    }
-
-    this.isFinishedInitDelayed_ = true;
+    this.table_.redraw();
   },
 
   initColumnModel_: function () {
@@ -367,8 +352,6 @@
   },
 
   renderColumn_: function(entry, columnId, table) {
-    this.delayedInitLabels_ = [];
-
     var container = this.document_.createElement('div');
     container.className = 'detail-container-' + columnId;
 
@@ -387,16 +370,9 @@
           text.textContent = entry['title'][i];
           label.appendChild(text);
 
-          var addContextMenu = function() {
-            cr.ui.contextMenuHandler.addContextMenuProperty(label);
-            label.contextMenu = this.tableContextMenu_;
-          };
+          cr.ui.contextMenuHandler.addContextMenuProperty(label);
+          label.contextMenu = this.tableContextMenu_;
 
-          if (this.isFinishedInitDelayed_)
-            addContextMenu.call(this);
-          else
-            this.delayedInitLabels_.push(addContextMenu.bind(this));
-
           label.addEventListener('dblclick', (function(uniqueId) {
               this.activatePage(uniqueId);
           }).bind(this, entry['uniqueId'][i]));