diff options
author | garykac <garykac@chromium.org> | 2015-05-11 10:48:33 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-11 17:49:44 +0000 |
commit | 43a567e77774c668ade221a36023faaf795fe1df (patch) | |
tree | f2b0058b41656516687eafb6e7ae7174e7da6401 /remoting/remoting_webapp_files.gypi | |
parent | 5680b241063cc434af2609809b7a17b5e39a55b4 (diff) | |
download | chromium_src-43a567e77774c668ade221a36023faaf795fe1df.zip chromium_src-43a567e77774c668ade221a36023faaf795fe1df.tar.gz chromium_src-43a567e77774c668ade221a36023faaf795fe1df.tar.bz2 |
[Chromoting] Move shared webapp JS files from crd/js -> base/js
All changes are in the GYPI and GNI files.
No changes in the JS files.
BUG=
Review URL: https://codereview.chromium.org/1133913002
Cr-Commit-Position: refs/heads/master@{#329175}
Diffstat (limited to 'remoting/remoting_webapp_files.gypi')
-rw-r--r-- | remoting/remoting_webapp_files.gypi | 215 |
1 files changed, 110 insertions, 105 deletions
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi index c9db232..6ffdbf7 100644 --- a/remoting/remoting_webapp_files.gypi +++ b/remoting/remoting_webapp_files.gypi @@ -82,30 +82,30 @@ 'webapp/base/js/base_unittest.js', 'webapp/base/js/base_event_hook_unittest.js', 'webapp/base/js/base_inherits_unittest.js', + 'webapp/base/js/client_session_unittest.js', + 'webapp/base/js/client_session_factory_unittest.js', + 'webapp/base/js/dns_blackhole_checker_unittest.js', + 'webapp/base/js/error_unittest.js', + 'webapp/base/js/fallback_signal_strategy_unittest.js', + 'webapp/base/js/identity_unittest.js', 'webapp/base/js/ipc_unittest.js', + 'webapp/base/js/l10n_unittest.js', 'webapp/base/js/protocol_extension_manager_unittest.js', + 'webapp/base/js/typecheck_unittest.js', 'webapp/base/js/viewport_unittest.js', + 'webapp/base/js/xhr_unittest.js', + 'webapp/base/js/xmpp_connection_unittest.js', + 'webapp/base/js/xmpp_login_handler_unittest.js', + 'webapp/base/js/xmpp_stream_parser_unittest.js', 'webapp/crd/js/apps_v2_migration_unittest.js', - 'webapp/crd/js/client_session_unittest.js', - 'webapp/crd/js/client_session_factory_unittest.js', - 'webapp/crd/js/dns_blackhole_checker_unittest.js', - 'webapp/crd/js/error_unittest.js', - 'webapp/crd/js/fallback_signal_strategy_unittest.js', 'webapp/crd/js/gcd_client_unittest.js', 'webapp/crd/js/gcd_client_with_mock_xhr_unittest.js', 'webapp/crd/js/host_controller_unittest.js', 'webapp/crd/js/host_daemon_facade_unittest.js', 'webapp/crd/js/host_list_api_impl_unittest.js', 'webapp/crd/js/host_table_entry_unittest.js', - 'webapp/crd/js/identity_unittest.js', - 'webapp/crd/js/l10n_unittest.js', 'webapp/crd/js/menu_button_unittest.js', 'webapp/crd/js/mock_xhr_unittest.js', - 'webapp/crd/js/typecheck_unittest.js', - 'webapp/crd/js/xhr_unittest.js', - 'webapp/crd/js/xmpp_connection_unittest.js', - 'webapp/crd/js/xmpp_login_handler_unittest.js', - 'webapp/crd/js/xmpp_stream_parser_unittest.js', ], 'remoting_webapp_unittests_js_mock_files': [ # Some proto files can be repurposed as simple mocks for the unittests. @@ -141,7 +141,82 @@ 'webapp/crd/html/template_unittests.html', # - # Webapp JavaScript file groups. + # Shared webapp JavaScript file groups. + # + + # Auth (Google account) JavaScript files. + 'remoting_webapp_shared_js_auth_google_files': [ + 'webapp/base/js/auth_init.js', + 'webapp/base/js/identity.js', + 'webapp/base/js/oauth2.js', + 'webapp/base/js/oauth2_api.js', + 'webapp/base/js/oauth2_api_impl.js', + ], + # Client JavaScript files. + 'remoting_webapp_shared_js_client_files': [ + 'webapp/base/js/activity.js', + 'webapp/base/js/client_plugin.js', + 'webapp/base/js/client_plugin_host_desktop_impl.js', + 'webapp/base/js/client_plugin_impl.js', + 'webapp/base/js/client_session.js', + 'webapp/base/js/client_session_factory.js', + 'webapp/base/js/clipboard.js', + 'webapp/base/js/connected_view.js', + 'webapp/base/js/connection_info.js', + 'webapp/base/js/credentials_provider.js', + 'webapp/base/js/host_desktop.js', + 'webapp/base/js/smart_reconnector.js', + ], + # Remoting core JavaScript files. + 'remoting_webapp_shared_js_core_files': [ + 'webapp/base/js/app_capabilities.js', + 'webapp/base/js/application.js', + 'webapp/base/js/base.js', + 'webapp/base/js/ipc.js', + 'webapp/base/js/modal_dialogs.js', + 'webapp/base/js/platform.js', + 'webapp/base/js/protocol_extension_manager.js', + 'webapp/base/js/protocol_extension.js', + 'webapp/base/js/error.js', + 'webapp/base/js/plugin_settings.js', + 'webapp/base/js/typecheck.js', + 'webapp/base/js/xhr.js', + ], + # Host JavaScript files. + 'remoting_webapp_shared_js_host_files': [ + 'webapp/base/js/host.js', + 'webapp/base/js/host_settings.js', + ], + # Logging and stats JavaScript files. + 'remoting_webapp_shared_js_logging_files': [ + 'webapp/base/js/format_iq.js', + 'webapp/base/js/log_to_server.js', + 'webapp/base/js/server_log_entry.js', + 'webapp/base/js/stats_accumulator.js', + ], + # Remoting signaling files. + 'remoting_webapp_shared_js_signaling_files': [ + 'webapp/base/js/dns_blackhole_checker.js', + 'webapp/base/js/fallback_signal_strategy.js', + 'webapp/base/js/signal_strategy.js', + 'webapp/base/js/tcp_socket.js', + 'webapp/base/js/wcs_adapter.js', + 'webapp/base/js/wcs_sandbox_container.js', + 'webapp/base/js/xmpp_connection.js', + 'webapp/base/js/xmpp_login_handler.js', + 'webapp/base/js/xmpp_stream_parser.js', + ], + # Shared UI JavaScript files. + 'remoting_webapp_shared_js_ui_files': [ + 'webapp/base/js/connection_stats.js', + 'webapp/base/js/l10n.js', + 'webapp/base/js/ui_mode.js', + 'webapp/base/js/viewport.js', + 'webapp/base/js/window_shape.js', + ], + + # + # DesktopRemoting webapp JavaScript file groups. # # Auth (apps v1) JavaScript files. @@ -156,61 +231,21 @@ 'webapp/crd/js/third_party_host_permissions.js', 'webapp/crd/js/third_party_token_fetcher.js', ], - # Auth (Google account) JavaScript files. - 'remoting_webapp_js_auth_google_files': [ - 'webapp/base/js/auth_init.js', - 'webapp/crd/js/identity.js', - 'webapp/crd/js/oauth2.js', - 'webapp/crd/js/oauth2_api.js', - 'webapp/crd/js/oauth2_api_impl.js', - ], # Cast extension handler JavaScript files. 'remoting_webapp_js_cast_extension_files': [ 'webapp/crd/js/cast_extension_handler.js', ], # Client JavaScript files. 'remoting_webapp_js_client_files': [ - 'webapp/crd/js/activity.js', - 'webapp/crd/js/client_plugin.js', - 'webapp/crd/js/client_plugin_impl.js', - 'webapp/crd/js/client_plugin_host_desktop_impl.js', - 'webapp/crd/js/client_session.js', - 'webapp/crd/js/client_session_factory.js', - 'webapp/crd/js/clipboard.js', - 'webapp/crd/js/connected_view.js', - 'webapp/crd/js/connection_info.js', - 'webapp/crd/js/credentials_provider.js', - 'webapp/crd/js/host_desktop.js', - 'webapp/crd/js/smart_reconnector.js', - 'webapp/crd/js/video_frame_recorder.js', - ], - # Remoting core JavaScript files. - 'remoting_webapp_js_core_files': [ - 'webapp/base/js/app_capabilities.js', - 'webapp/base/js/application.js', - 'webapp/base/js/base.js', - 'webapp/base/js/ipc.js', - 'webapp/base/js/modal_dialogs.js', - 'webapp/base/js/platform.js', - 'webapp/base/js/protocol_extension_manager.js', - 'webapp/base/js/protocol_extension.js', 'webapp/crd/js/apps_v2_migration.js', - 'webapp/crd/js/error.js', 'webapp/crd/js/event_handlers.js', - 'webapp/crd/js/plugin_settings.js', - 'webapp/crd/js/typecheck.js', - 'webapp/crd/js/xhr.js', 'webapp/crd/js/gcd_client.js', + 'webapp/crd/js/video_frame_recorder.js', ], # Gnubby authentication JavaScript files. 'remoting_webapp_js_gnubby_auth_files': [ 'webapp/crd/js/gnubby_auth_handler.js', ], - # Host JavaScript files. - 'remoting_webapp_js_host_files': [ - 'webapp/crd/js/host.js', - 'webapp/crd/js/host_settings.js', - ], # Files for controlling the local machine as a host. # Includes both it2me and me2me files. 'remoting_webapp_js_host_control_files': [ @@ -233,39 +268,6 @@ 'webapp/crd/js/host_table_entry.js', 'webapp/crd/js/local_host_section.js', ], - # Logging and stats JavaScript files. - 'remoting_webapp_js_logging_files': [ - 'webapp/crd/js/format_iq.js', - 'webapp/crd/js/log_to_server.js', - 'webapp/crd/js/server_log_entry.js', - 'webapp/crd/js/stats_accumulator.js', - ], - # Remoting signaling files. - 'remoting_webapp_js_signaling_files': [ - 'webapp/crd/js/dns_blackhole_checker.js', - 'webapp/crd/js/fallback_signal_strategy.js', - 'webapp/crd/js/signal_strategy.js', - 'webapp/crd/js/tcp_socket.js', - 'webapp/crd/js/wcs_adapter.js', - 'webapp/crd/js/wcs_sandbox_container.js', - 'webapp/crd/js/xmpp_connection.js', - 'webapp/crd/js/xmpp_login_handler.js', - 'webapp/crd/js/xmpp_stream_parser.js', - ], - # Shared UI JavaScript files. - 'remoting_webapp_js_ui_files': [ - 'webapp/base/js/viewport.js', - 'webapp/base/js/window_shape.js', - 'webapp/crd/js/connection_stats.js', - 'webapp/crd/js/feedback.js', - 'webapp/crd/js/l10n.js', - 'webapp/crd/js/ui_mode.js', - ], - - # - # DesktopRemoting-specific JS files. - # - # The CRD-specific JavaScript files required by main.html. 'remoting_webapp_crd_js_ui_files': [ 'webapp/crd/js/bump_scroller.js', @@ -277,6 +279,7 @@ 'webapp/crd/js/desktop_remoting.js', 'webapp/crd/js/desktop_remoting_activity.js', 'webapp/crd/js/desktop_viewport.js', + 'webapp/crd/js/feedback.js', 'webapp/crd/js/fullscreen.js', 'webapp/crd/js/fullscreen_v1.js', 'webapp/crd/js/fullscreen_v2.js', @@ -296,21 +299,23 @@ '<(DEPTH)/remoting/webapp/crd/html/template_main.html', # The shared JavaScript files required by main.html. + # These files are shared with the unittest target. '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)', + '<@(remoting_webapp_shared_js_core_files)', + '<@(remoting_webapp_shared_js_auth_google_files)', + '<@(remoting_webapp_shared_js_client_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)', '<@(remoting_webapp_js_auth_client2host_files)', - '<@(remoting_webapp_js_auth_google_files)', '<@(remoting_webapp_js_client_files)', '<@(remoting_webapp_js_gnubby_auth_files)', '<@(remoting_webapp_js_cast_extension_files)', - '<@(remoting_webapp_js_host_files)', '<@(remoting_webapp_js_host_control_files)', '<@(remoting_webapp_js_host_display_files)', - '<@(remoting_webapp_js_logging_files)', - '<@(remoting_webapp_js_ui_files)', - '<@(remoting_webapp_js_signaling_files)', ], # The JS files required by unittest.html. @@ -373,20 +378,20 @@ 'remoting_webapp_background_html_all_js_files': [ '<@(remoting_webapp_background_html_js_files)', 'webapp/base/js/base.js', + 'webapp/base/js/client_session.js', + 'webapp/base/js/error.js', + 'webapp/base/js/identity.js', 'webapp/base/js/ipc.js', - 'webapp/crd/js/client_session.js', - 'webapp/crd/js/error.js', + 'webapp/base/js/l10n.js', + 'webapp/base/js/oauth2.js', + 'webapp/base/js/oauth2_api.js', + 'webapp/base/js/oauth2_api_impl.js', + 'webapp/base/js/plugin_settings.js', + 'webapp/base/js/typecheck.js', + 'webapp/base/js/xhr.js', 'webapp/crd/js/host_installer.js', 'webapp/crd/js/host_session.js', - 'webapp/crd/js/identity.js', 'webapp/crd/js/it2me_host_facade.js', - 'webapp/crd/js/l10n.js', - 'webapp/crd/js/oauth2.js', - 'webapp/crd/js/oauth2_api.js', - 'webapp/crd/js/oauth2_api_impl.js', - 'webapp/crd/js/plugin_settings.js', - 'webapp/crd/js/typecheck.js', - 'webapp/crd/js/xhr.js', ], # @@ -408,8 +413,8 @@ # All the JavaScript files required by wcs_sandbox.html. 'remoting_webapp_wcs_sandbox_html_all_js_files': [ '<@(remoting_webapp_wcs_sandbox_html_js_files)', - 'webapp/crd/js/error.js', - 'webapp/crd/js/plugin_settings.js', + 'webapp/base/js/error.js', + 'webapp/base/js/plugin_settings.js', ], # |