Chromium Code Reviews| Index: remoting/remoting_webapp_files.gypi |
| diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi |
| index 93b74bb18be896c9eef2f9f4c2b3d5291b060780..66023fe633f2a66876f4f309b337433afafebeca 100644 |
| --- a/remoting/remoting_webapp_files.gypi |
| +++ b/remoting/remoting_webapp_files.gypi |
| @@ -131,6 +131,7 @@ |
| ], |
| # These product files are excluded from our JavaScript unittest |
| 'remoting_webapp_unittest_exclude_files': [ |
| + '<(remoting_webapp_background_entry_point)>', |
| # event_handlers.js is where the onLoad handler is defined, which |
| # makes it the entry point of the webapp. |
| 'webapp/event_handlers.js', |
| @@ -165,9 +166,19 @@ |
| '<@(remoting_webapp_js_wcs_container_files)', |
| # Uncomment this line to include browser test files in the web app |
| # to expedite debugging or local development. |
| - '<@(remoting_webapp_js_browser_test_files)' |
| + # '<@(remoting_webapp_js_browser_test_files)' |
| ], |
| + # The JavaScript files that are used as background pages. |
| + 'remoting_webapp_background_js_files': [ |
| + 'webapp/base.js', |
| + 'webapp/client_session.js', |
|
Jamie
2014/08/12 20:42:53
We shouldn't be pulling this into the background p
kelvinp
2014/08/12 21:42:42
This is because we would like to re-use events fro
Jamie
2014/08/12 21:54:56
Acknowledged.
|
| + 'webapp/typecheck.js', |
| + 'webapp/background/app_launcher.js', |
| + ], |
| + 'remoting_webapp_background_entry_point': |
| + 'webapp/background/background.js', |
| + |
| # The JavaScript files required by wcs_sandbox.html. |
| 'remoting_webapp_wcs_sandbox_html_js_files': [ |
| '<@(remoting_webapp_js_wcs_sandbox_files)', |
| @@ -179,6 +190,8 @@ |
| 'remoting_webapp_all_js_files': [ |
| # JS files for main.html. |
| '<@(remoting_webapp_main_html_js_files)', |
| + '<@(remoting_webapp_background_js_files)', |
| + '<(remoting_webapp_background_entry_point)', |
| # JS files for wcs_sandbox.html. |
| # Use r_w_js_wcs_sandbox_files instead of r_w_wcs_sandbox_html_js_files |
| # so that we don't double include error.js and plugin_settings.js. |
| @@ -231,6 +244,9 @@ |
| 'remoting_webapp_template_wcs_sandbox': |
| 'webapp/html/template_wcs_sandbox.html', |
| + 'remoting_webapp_template_background': |
| + 'webapp/html/template_background.html', |
| + |
| 'remoting_webapp_template_files': [ |
| 'webapp/html/butterbar.html', |
| 'webapp/html/client_plugin.html', |