Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2413)

Unified Diff: remoting/remoting_webapp_files.gypi

Issue 742473002: [Chromoting] Break up the webapp's init function into smaller chunks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix browsertest break by removing onload handler Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/remoting_webapp.gypi ('k') | remoting/webapp/base/js/auth_init.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_webapp_files.gypi
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi
index 358dbe544457f8b41e6eeed9517f30640e47a9c9..3275f993da0cfa74d2c0c8b61ad1526c63d96953 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',
@@ -154,9 +155,6 @@
# background.js is where the onLoad handler is defined, which
# makes it the entry point of the background page.
'webapp/crd/js/background.js',
- # event_handlers.js is where the onLoad handler is defined, which
- # makes it the entry point of the webapp.
- 'webapp/crd/js/event_handlers.js',
],
# The unit test cases for the webapp
'remoting_webapp_unittest_js_files': [
@@ -178,8 +176,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 +197,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_main.js',
+ ],
+
# The JavaScript files that are used in the background page.
'remoting_webapp_background_js_files': [
'webapp/base/js/base.js',
@@ -229,10 +232,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 +247,12 @@
'<@(remoting_webapp_js_auth_v1_files)',
],
+ # All the JavaScript files required by CRD.
+ 'remoting_webapp_crd_js_files': [
+ '<@(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 +288,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)',
],
« no previous file with comments | « remoting/remoting_webapp.gypi ('k') | remoting/webapp/base/js/auth_init.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698