Chromium Code Reviews| Index: remoting/webapp/files.gni |
| diff --git a/remoting/webapp/files.gni b/remoting/webapp/files.gni |
| index 08e34271e760d11ebdd8af493930543312ba7343..4bc2b8389741829172923ef04e00c0a1ace680e3 100644 |
| --- a/remoting/webapp/files.gni |
| +++ b/remoting/webapp/files.gni |
| @@ -10,7 +10,8 @@ |
| # MM `Mb.YM. , 8M MM `Mb MM MM MM MM YM. , |
| # .JMML. .JMM.`Mbmmd' `Moo9^Yo.`Wbmd"MML..JMML JMML JMML.`Mbmmd' |
| # |
| -# Please keep this file in sync with remoting/remoting_webapp_files.gypi. |
| +# Please keep this file in sync with remoting/remoting_webapp_files.gypi |
| +# and remoting/app_remoting_webapp_files.gypi. |
| # Jscompile proto files. |
| # These provide type information for jscompile. |
| @@ -235,13 +236,11 @@ remoting_webapp_js_auth_client2host_files = [ |
| remoting_webapp_js_cast_extension_files = [ "crd/js/cast_extension_handler.js" ] |
| # Client JavaScript files. |
| -remoting_webapp_js_client_files = [ "crd/js/video_frame_recorder.js" ] |
| - |
| -# Remoting core JavaScript files. |
| -remoting_webapp_js_core_files = [ |
| +remoting_webapp_js_client_files = [ |
| "crd/js/apps_v2_migration.js", |
| "crd/js/event_handlers.js", |
| "crd/js/gcd_client.js", |
| + "crd/js/video_frame_recorder.js", |
|
garykac
2015/05/15 22:33:51
These changes update GN to match the current GYP v
|
| ] |
| # Gnubby authentication JavaScript files. |
| @@ -278,7 +277,6 @@ remoting_webapp_crd_js_ui_files = [ |
| "crd/js/crd_auth_dialog.js", |
| "crd/js/crd_event_handlers.js", |
| "crd/js/crd_experimental.js", |
| - "crd/js/crd_main.js", |
| "crd/js/desktop_connected_view.js", |
| "crd/js/desktop_remoting.js", |
| "crd/js/desktop_remoting_activity.js", |
| @@ -324,7 +322,8 @@ remoting_webapp_shared_main_html_js_files = |
| # The CRD-specific JavaScript files required by main.html. |
| remoting_webapp_crd_main_html_all_js_files = |
| - remoting_webapp_shared_main_html_js_files + remoting_webapp_crd_js_ui_files |
| + remoting_webapp_shared_main_html_js_files + |
| + remoting_webapp_crd_js_ui_files + [ "crd/js/crd_main.js" ] |
| # These template files are used to construct main.html. |
| remoting_webapp_template_files = [ |
| @@ -353,7 +352,7 @@ remoting_webapp_template_files = [ |
| ] |
| # |
| -# Webapp background.html generation files. |
| +# DesktopRemoting background.html generation files. |
| # |
| remoting_webapp_template_background = "crd/html/template_background.html" |
| @@ -390,7 +389,7 @@ remoting_webapp_background_html_all_js_files += [ |
| ] |
| # |
| -# Webapp wcs_sandbox.html generation files. |
| +# DesktopRemoting wcs_sandbox.html generation files. |
| # |
| remoting_webapp_template_wcs_sandbox = "base/html/template_wcs_sandbox.html" |
| @@ -413,7 +412,7 @@ remoting_webapp_wcs_sandbox_html_all_js_files += [ |
| ] |
| # |
| -# Webapp message_window.html generation files. |
| +# DesktopRemoting message_window.html generation files. |
| # |
| remoting_webapp_template_message_window = |
| @@ -428,7 +427,7 @@ remoting_webapp_message_window_html_all_js_files = |
| remoting_webapp_message_window_html_js_files + [ "base/js/base.js" ] |
| # |
| -# Complete webapp JS and resource files. |
| +# DesktopRemoting webapp JS and resource files. |
| # |
| # All the JavaScript files that are shared by webapps. |
| @@ -498,3 +497,114 @@ desktop_remoting_webapp_localizable_files = [ |
| "<@(remoting_webapp_template_files)", |
| "<@(remoting_webapp_crd_js_files)", |
| ] |
| + |
| +# |
| +# AppRemoting Files |
| +# |
| + |
| +ar_shared_resource_files = [ |
| + "app_remoting/html/ar_dialog.css", |
| + "app_remoting/html/ar_main.css", |
| + "app_remoting/html/feedback_consent.css", |
| + "app_remoting/html/loading_window.css", |
| + "app_remoting/html/context_menu.css", |
| + "../resources/drag.webp", |
| + ] + remoting_webapp_resource_files |
| + |
| +# |
| +# AppRemoting main.html generation files. |
| +# |
| + |
| +# These template files are used to construct the webapp html files. |
| +ar_main_template = "app_remoting/html/template_lg.html" |
| + |
| +ar_main_template_files = [ |
| + "base/html/client_plugin.html", |
| + "app_remoting/html/context_menu.html", |
| + "app_remoting/html/idle_dialog.html", |
| +] |
| + |
| +ar_main_js_files = [ |
| + "app_remoting/js/application_context_menu.js", |
| + "app_remoting/js/app_connected_view.js", |
| + "app_remoting/js/app_remoting.js", |
| + "app_remoting/js/app_remoting_activity.js", |
| + "app_remoting/js/ar_auth_dialog.js", |
| + "app_remoting/js/ar_main.js", |
| + "app_remoting/js/context_menu_adapter.js", |
| + "app_remoting/js/context_menu_chrome.js", |
| + "app_remoting/js/context_menu_dom.js", |
| + "app_remoting/js/drag_and_drop.js", |
| + "app_remoting/js/idle_detector.js", |
| + "app_remoting/js/keyboard_layouts_menu.js", |
| + "app_remoting/js/loading_window.js", |
| + "app_remoting/js/submenu_manager.js", |
| + "app_remoting/js/window_activation_menu.js", |
| + "base/js/application.js", |
| + "base/js/base.js", |
| + "base/js/message_window_helper.js", |
| + "base/js/message_window_manager.js", |
| + ] + remoting_webapp_shared_js_auth_google_files + |
| + remoting_webapp_shared_js_client_files + |
| + remoting_webapp_shared_js_core_files + |
| + remoting_webapp_shared_js_host_files + |
| + remoting_webapp_shared_js_logging_files + |
| + remoting_webapp_shared_js_signaling_files + |
| + remoting_webapp_shared_js_ui_files |
| + |
| +# |
| +# AppRemoting feedback_consent.html generation files. |
| +# |
| + |
| +ar_feedback_consent_template = |
| + "app_remoting/html/template_feedback_consent.html" |
| + |
| +# These JS files are specific to the feedback consent page and are not part |
| +# of the main JS files. |
| +ar_feedback_consent_html_js_files = [ "app_remoting/js/feedback_consent.js" ] |
| + |
| +# All the JavaScript files required by feedback_consent.html. |
| +ar_feedback_consent_html_all_js_files = [ |
| + "app_remoting/js/feedback_consent.js", |
| + "base/js/base.js", |
| + "base/js/error.js", |
| + "base/js/identity.js", |
| + "base/js/oauth2_api.js", |
| + "base/js/oauth2_api_impl.js", |
| + "base/js/plugin_settings.js", |
| + "base/js/l10n.js", |
| + "base/js/xhr.js", |
| +] |
| + |
| +# |
| +# AppRemoting loading_window.html generation files. |
| +# |
| + |
| +# Variables for loading_window.html. Note that the JS files are the same as |
| +# for message_window.html, and are not duplicated here. |
| +ar_loading_window_template = "app_remoting/html/template_loading_window.html" |
| + |
| +# |
| +# AppRemoting background JS files. |
| +# These files are referenced from the manifest |
| +# |
| + |
| +ar_background_js_files = [ |
| + "app_remoting/js/ar_background.js", |
| + "base/js/platform.js", |
| +] |
| + |
| +ar_all_js_files = |
| + ar_main_js_files + ar_feedback_consent_html_js_files + |
| + remoting_webapp_message_window_html_js_files + |
| + remoting_webapp_wcs_sandbox_html_js_files + ar_background_js_files |
| + |
| +# Files that contain localizable strings. |
| +app_remoting_webapp_localizable_files = |
| + [ |
| + ar_main_template, |
| + ar_feedback_consent_template, |
| + ar_loading_window_template, |
| + remoting_webapp_template_message_window, |
| + remoting_webapp_template_wcs_sandbox, |
| + ] + ar_main_template_files + ar_all_js_files |