diff options
| author | kelvinp <kelvinp@chromium.org> | 2015-10-01 12:16:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-01 19:17:52 +0000 |
| commit | 08d28524dc2673bc7e85b37d2b82d0d65c34ea05 (patch) | |
| tree | 6446118b5150fb451a59c557d13693abf327f455 /remoting/remoting_webapp_files.gypi | |
| parent | 86d0a29db0067654762764bf51a69c450435668a (diff) | |
| download | chromium_src-08d28524dc2673bc7e85b37d2b82d0d65c34ea05.zip chromium_src-08d28524dc2673bc7e85b37d2b82d0d65c34ea05.tar.gz chromium_src-08d28524dc2673bc7e85b37d2b82d0d65c34ea05.tar.bz2 | |
[Chromoting] Remote Assistance in Public Session.
This CL provides remote assistance in Public Session.
Summary of changes:
1. Move the remoting.testEvents initialization to ui_mode.js
as it is only referenced there.
2. Create a separate page public_session.html that contains the
main ui for public session.
3. Use the service account email address to infer whether we
are currently in a public session.
4. Decouple remoting.HostController from host_screen.js
Previously, remoting.HostController is used to retrieve the
host version, which is problematic as that refers to the me2me
host version as opposed to the it2me host version.
BUG=508608
Review URL: https://codereview.chromium.org/1370283004
Cr-Commit-Position: refs/heads/master@{#351861}
Diffstat (limited to 'remoting/remoting_webapp_files.gypi')
| -rw-r--r-- | remoting/remoting_webapp_files.gypi | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi index 5e90ca7..a080136 100644 --- a/remoting/remoting_webapp_files.gypi +++ b/remoting/remoting_webapp_files.gypi @@ -288,6 +288,17 @@ 'webapp/crd/js/native_message_host_log_message_handler.js', 'webapp/crd/js/paired_client_manager.js', ], + # Files for controlling the local it2me host. + # Included by public_session.html. + 'remoting_webapp_js_it2me_host_control_files': [ + 'webapp/crd/js/buffered_signal_strategy.js', + 'webapp/crd/js/host_screen.js', + 'webapp/crd/js/host_session.js', + 'webapp/crd/js/host_install_dialog.js', + 'webapp/crd/js/host_installer.js', + 'webapp/crd/js/it2me_host_facade.js', + 'webapp/crd/js/native_message_host_log_message_handler.js', + ], # Files for displaying (in the client) info about available hosts. 'remoting_webapp_js_host_display_files': [ 'webapp/crd/js/host_list.js', @@ -353,6 +364,27 @@ '<@(remoting_webapp_js_host_display_files)', ], + 'remoting_webapp_template_public_session': + '<(DEPTH)/remoting/webapp/crd/html/template_public_session.html', + + # The shared JavaScript files required by public_session.html. + 'remoting_webapp_public_session_html_all_js_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_it2me_host_control_files)', + 'webapp/crd/js/public_session_main.js', + ], + + # These template files are used to construct public_session.html. + 'remoting_webapp_public_session_template_files': [ + 'webapp/crd/html/dialog_host.html', + ], + # The JS files required by unittest.html. 'remoting_webapp_unittest_html_all_js_files': [ '<@(remoting_webapp_shared_main_html_js_files)', @@ -498,6 +530,7 @@ '<@(remoting_webapp_shared_js_files)', '<@(remoting_webapp_crd_main_html_all_js_files)', '<@(remoting_webapp_credits_html_all_js_files)', + '<@(remoting_webapp_public_session_html_all_js_files)', ], 'remoting_webapp_info_files': [ @@ -538,6 +571,7 @@ 'webapp/crd/html/crd_main.css', 'webapp/crd/html/toolbar.css', 'webapp/crd/html/menu_button.css', + 'webapp/crd/html/public_session.css', 'webapp/crd/html/window_frame.css', 'webapp/crd/resources/scale-to-fit.webp', ], |