diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 04:14:17 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 04:14:17 +0000 |
| commit | 829168195a22aabe97e554e4c46d64dcdf6e7686 (patch) | |
| tree | 2c2a87361f31d4bf2f5b2b968b54ebeb70033b18 /chrome/browser/browser_resources.grd | |
| parent | 847349fe1928c53478bcbdbfeb86337919e19467 (diff) | |
| download | chromium_src-829168195a22aabe97e554e4c46d64dcdf6e7686.zip chromium_src-829168195a22aabe97e554e4c46d64dcdf6e7686.tar.gz chromium_src-829168195a22aabe97e554e4c46d64dcdf6e7686.tar.bz2 | |
WebUI TaskManager: Make the initialization of model (in browser process) and UI (in render process) paralleled.
- Moves the sending of 'enableTaskManager' command to the first of the loading.
- Adds the "onReadyPeriodicalUpdated" callback. It is fired when the last of initialize of task manager model. On JS side, the list is refreshed forcibly by this event.
- Separates the code of initialization of task manager from main.js into preload.js and defines.js.
- Moves the code of sending command from main.js to commands.js.
BUG=113939
TEST=manual
Review URL: http://codereview.chromium.org/9388001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
| -rw-r--r-- | chrome/browser/browser_resources.grd | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index aef5da9..a3865f6 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -122,7 +122,11 @@ <include name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_TASK_MANAGER_HTML" file="resources\task_manager\main.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_TASK_MANAGER_COMMANDS_JS" file="resources\task_manager\commands.js" type="BINDATA" /> + <!-- The following defines.js uses flattenhtml feature to remove the platform-dependent code at complie-time. --> + <include name="IDR_TASK_MANAGER_DEFINES_JS" file="resources\task_manager\defines.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_TASK_MANAGER_INCLUDES_JS" file="resources\task_manager\includes.js" type="BINDATA" /> + <include name="IDR_TASK_MANAGER_PRELOAD_JS" file="resources\task_manager\preload.js" type="BINDATA" /> <!-- The following main.js uses flattenhtml feature to remove the platform-dependent code at complie-time. --> <include name="IDR_TASK_MANAGER_JS" file="resources\task_manager\main.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_TASK_MANAGER_MEASURE_TIME_JS" file="resources\task_manager\measure_time.js" type="BINDATA" /> |