Chromium Code Reviews| Index: remoting/remoting_webapp_files.gypi |
| diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi |
| index 77515ffbc361209fa405cadc47b96106726275f3..ad94789a56d416d12bfe5bca1c5f5de1b4995967 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,39 @@ |
| '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', |
|
kelvinp
2015/04/27 17:18:28
Not related to this CL, why does app_remoting depe
garykac
2015/04/27 17:36:28
The intent is that ui_mode should eventually go aw
|
| + ], |
| + |
| + # |
| + # 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/crd_main.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', |
| ], |
| @@ -290,14 +306,7 @@ |
| # 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', |
| - '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', |
| + '<@(remoting_webapp_crd_js_ui_files)', |
| ], |
| # These template files are used to construct main.html. |