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..842e1154006f8a7f64a4723acf736dfd4291e483 100644 |
--- a/chrome/browser/resources/task_manager/main.js |
+++ b/chrome/browser/resources/task_manager/main.js |
@@ -145,16 +145,17 @@ TaskManager.prototype = { |
this.opt_ = opt; |
- this.initialized_ = true; |
this.enableTaskManager(); |
this.dialogDom_ = dialogDom; |
this.document_ = dialogDom.ownerDocument; |
- $('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)); |
+ 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.is_column_shown_ = []; |
for (var i = 0; i < DEFAULT_COLUMNS.length; i++) { |
@@ -203,17 +204,26 @@ TaskManager.prototype = { |
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_(); |
- this.table_.redraw(); |
+ |
+ this.isFinishedInitDelayed_ = true; |
}, |
initColumnModel_: function () { |
@@ -369,8 +379,10 @@ TaskManager.prototype = { |
text.textContent = entry['title'][i]; |
label.appendChild(text); |
- cr.ui.contextMenuHandler.addContextMenuProperty(label); |
- label.contextMenu = this.tableContextMenu_; |
+ if (this.isFinishedInitDelayed_) { |
mazda
2011/12/05 03:42:11
Is it OK to reach here when this.isFinishedInitDel
yoshiki
2011/12/05 08:38:15
It's ok. This block adds context menu handler to l
mazda
2011/12/06 09:58:18
I think it's undesirable.
How about storing the l
yoshiki
2011/12/07 16:01:09
Done.
|
+ cr.ui.contextMenuHandler.addContextMenuProperty(label); |
+ label.contextMenu = this.tableContextMenu_; |
+ } |
label.addEventListener('dblclick', (function(uniqueId) { |
this.activatePage(uniqueId); |