Chromium Code Reviews| Index: remoting/remoting_webapp_files.gypi |
| diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi |
| index 358dbe544457f8b41e6eeed9517f30640e47a9c9..eff66eae16ec3c3a4c9dfc7a03131bc832ffaed2 100644 |
| --- a/remoting/remoting_webapp_files.gypi |
| +++ b/remoting/remoting_webapp_files.gypi |
| @@ -34,6 +34,7 @@ |
| # Auth (Google account) JavaScript files. |
| 'remoting_webapp_js_auth_google_files': [ |
| 'webapp/base/js/auth_dialog.js', |
| + 'webapp/base/js/auth_init.js', |
| 'webapp/crd/js/identity.js', |
| 'webapp/crd/js/oauth2.js', |
| 'webapp/crd/js/oauth2_api.js', |
| @@ -178,8 +179,8 @@ |
| 'remoting_webapp_unittest_template_main': |
| 'webapp/crd/html/template_unittest.html', |
| - # The JavaScript files required by main.html. |
| - 'remoting_webapp_main_html_js_files': [ |
| + # The shared JavaScript files required by main.html. |
| + 'remoting_webapp_shared_main_html_js_files': [ |
| # Include the core files first as it is required by the other files. |
| # Otherwise, Jscompile will complain. |
| '<@(remoting_webapp_js_core_files)', |
| @@ -199,6 +200,11 @@ |
| # '<@(remoting_webapp_js_browser_test_files)' |
| ], |
| + # The CRD-specific JavaScript files required by main.html. |
| + 'remoting_webapp_crd_main_html_js_files': [ |
| + 'webapp/crd/js/crd_init.js', |
| + ], |
| + |
| # The JavaScript files that are used in the background page. |
| 'remoting_webapp_background_js_files': [ |
| 'webapp/base/js/base.js', |
| @@ -229,10 +235,10 @@ |
| 'webapp/crd/js/plugin_settings.js', |
| ], |
| - # All the JavaScript files required by the webapp. |
| - 'remoting_webapp_all_js_files': [ |
| + # All the JavaScript files that are shared by webapps. |
| + 'remoting_webapp_shared_js_files': [ |
| # JS files for main.html. |
| - '<@(remoting_webapp_main_html_js_files)', |
| + '<@(remoting_webapp_shared_main_html_js_files)', |
| '<@(remoting_webapp_background_js_files)', |
| # JS files for message_window.html |
| 'webapp/base/js/message_window.js', |
| @@ -244,6 +250,12 @@ |
| '<@(remoting_webapp_js_auth_v1_files)', |
| ], |
| + # All the JavaScript files required by CRD. |
| + 'remoting_webapp_crd_js_files': [ |
|
garykac
2014/11/19 19:06:40
This change effectively renames _all_js_files to _
|
| + '<@(remoting_webapp_shared_js_files)', |
| + '<@(remoting_webapp_crd_main_html_js_files)', |
| + ], |
| + |
| 'remoting_webapp_resource_files': [ |
| 'resources/disclosure_arrow_down.webp', |
| 'resources/disclosure_arrow_right.webp', |
| @@ -279,9 +291,9 @@ |
| 'webapp/crd/resources/scale-to-fit.webp', |
| ], |
| - 'remoting_webapp_files': [ |
| + 'remoting_webapp_crd_files': [ |
| '<@(remoting_webapp_info_files)', |
| - '<@(remoting_webapp_all_js_files)', |
| + '<@(remoting_webapp_crd_js_files)', |
| '<@(remoting_webapp_resource_files)', |
| ], |