| Index: remoting/remoting_webapp_files.gypi
|
| diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi
|
| index 77515ffbc361209fa405cadc47b96106726275f3..ca7f53c4fbb53e41e1c0cfd9cd56cde7831a3004 100644
|
| --- a/remoting/remoting_webapp_files.gypi
|
| +++ b/remoting/remoting_webapp_files.gypi
|
| @@ -167,7 +167,6 @@
|
| 'webapp/crd/js/connected_view.js',
|
| 'webapp/crd/js/connection_info.js',
|
| 'webapp/crd/js/credentials_provider.js',
|
| - 'webapp/crd/js/desktop_connected_view.js',
|
| 'webapp/crd/js/host_desktop.js',
|
| 'webapp/crd/js/smart_reconnector.js',
|
| 'webapp/crd/js/video_frame_recorder.js',
|
| @@ -239,22 +238,38 @@
|
| 'webapp/crd/js/xmpp_login_handler.js',
|
| 'webapp/crd/js/xmpp_stream_parser.js',
|
| ],
|
| - # UI JavaScript files.
|
| + # 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',
|
| 'webapp/crd/js/butter_bar.js',
|
| - 'webapp/crd/js/connection_stats.js',
|
| + 'webapp/crd/js/crd_auth_dialog.js',
|
| + 'webapp/crd/js/crd_event_handlers.js',
|
| + 'webapp/crd/js/crd_experimental.js',
|
| + 'webapp/crd/js/desktop_connected_view.js',
|
| + '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',
|
| - 'webapp/crd/js/l10n.js',
|
| + 'webapp/crd/js/it2me_activity.js',
|
| + 'webapp/crd/js/me2me_activity.js',
|
| 'webapp/crd/js/menu_button.js',
|
| 'webapp/crd/js/options_menu.js',
|
| - 'webapp/crd/js/ui_mode.js',
|
| 'webapp/crd/js/toolbar.js',
|
| 'webapp/crd/js/window_frame.js',
|
| ],
|
| @@ -287,17 +302,17 @@
|
| #'<@(remoting_webapp_browsertest_all_js_files)',
|
| ],
|
|
|
| + # The JS files required by unittest.html.
|
| + 'remoting_webapp_unittest_html_all_js_files': [
|
| + '<@(remoting_webapp_shared_main_html_js_files)',
|
| + '<@(remoting_webapp_crd_js_ui_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)',
|
| - 'webapp/crd/js/crd_auth_dialog.js',
|
| - 'webapp/crd/js/crd_event_handlers.js',
|
| - 'webapp/crd/js/crd_experimental.js',
|
| + '<@(remoting_webapp_crd_js_ui_files)',
|
| 'webapp/crd/js/crd_main.js',
|
| - 'webapp/crd/js/desktop_remoting.js',
|
| - 'webapp/crd/js/desktop_remoting_activity.js',
|
| - 'webapp/crd/js/it2me_activity.js',
|
| - 'webapp/crd/js/me2me_activity.js',
|
| ],
|
|
|
| # These template files are used to construct main.html.
|
|
|