diff options
author | Zeno Albisser <zeno.albisser@theqtcompany.com> | 2014-12-05 15:04:29 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-09 10:49:28 +0100 |
commit | af6588f8d723931a298c995fa97259bb7f7deb55 (patch) | |
tree | 060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/remoting | |
parent | 2fff84d821cc7b1c785f6404e0f8091333283e74 (diff) | |
download | qtwebengine-chromium-af6588f8d723931a298c995fa97259bb7f7deb55.tar.gz |
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/remoting')
-rw-r--r-- | chromium/remoting/proto/chromotocol.gyp | 1 | ||||
-rw-r--r-- | chromium/remoting/remoting.gyp | 24 | ||||
-rw-r--r-- | chromium/remoting/remoting_android.gypi | 69 | ||||
-rw-r--r-- | chromium/remoting/remoting_client.gypi | 23 | ||||
-rw-r--r-- | chromium/remoting/remoting_host.gypi | 277 | ||||
-rw-r--r-- | chromium/remoting/remoting_host_linux.gypi | 88 | ||||
-rw-r--r-- | chromium/remoting/remoting_host_win.gypi | 18 | ||||
-rw-r--r-- | chromium/remoting/remoting_nacl.gyp | 14 | ||||
-rw-r--r-- | chromium/remoting/remoting_srcs.gypi | 78 | ||||
-rw-r--r-- | chromium/remoting/remoting_test.gypi | 303 | ||||
-rw-r--r-- | chromium/remoting/remoting_webapp.gypi | 7 | ||||
-rw-r--r-- | chromium/remoting/remoting_webapp_files.gypi | 270 |
12 files changed, 823 insertions, 349 deletions
diff --git a/chromium/remoting/proto/chromotocol.gyp b/chromium/remoting/proto/chromotocol.gyp index baf8c40e92c..3f6778d0c88 100644 --- a/chromium/remoting/proto/chromotocol.gyp +++ b/chromium/remoting/proto/chromotocol.gyp @@ -8,6 +8,7 @@ }, 'targets': [ { + # GN version: //remoting/proto 'target_name': 'chromotocol_proto_lib', 'type': 'static_library', 'sources': [ diff --git a/chromium/remoting/remoting.gyp b/chromium/remoting/remoting.gyp index f1979164b25..c693083d913 100644 --- a/chromium/remoting/remoting.gyp +++ b/chromium/remoting/remoting.gyp @@ -9,6 +9,9 @@ # Set this to run the jscompile checks after building the webapp. 'run_jscompile%': 0, + # Set this to enable cast mode on the android client. + 'enable_cast%': 0, + 'variables': { 'conditions': [ # Enable the multi-process host on Windows by default. @@ -48,6 +51,7 @@ }], ], 'remoting_locales': [ + # Note: list duplicated in GN build. See //remoting/resources/BUILD.gn 'ar', 'bg', 'ca', 'cs', 'da', 'de', 'el', 'en', 'en-GB', 'es', 'es-419', 'et', 'fi', 'fil', 'fr', 'he', 'hi', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'lt', 'lv', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', @@ -146,6 +150,7 @@ }, # end of target 'remoting_breakpad' { + # GN version: //remoting/resources 'target_name': 'remoting_resources', 'type': 'none', 'dependencies': [ @@ -153,7 +158,6 @@ ], 'variables': { 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)', - 'grit_resource_ids': 'resources/resource_ids', 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/main.html', 'base/resources_unittest.cc', @@ -165,21 +169,13 @@ 'host/win/host_messages.mc.jinja2', 'host/win/version.rc.jinja2', 'resources/play_store_resources.cc', - 'webapp/background.js', - 'webapp/butter_bar.js', - 'webapp/client_screen.js', - 'webapp/error.js', - 'webapp/host_list.js', - 'webapp/host_setup_dialog.js', - 'webapp/host_table_entry.js', - 'webapp/manifest.json.jinja2', - 'webapp/paired_client_manager.js', - 'webapp/remoting.js', - 'webapp/window_frame.js', + 'webapp/crd/manifest.json.jinja2', + '<@(remoting_webapp_all_js_files)', ], }, 'actions': [ { + # GN version: //remoting/resources:verify_resources 'action_name': 'verify_resources', 'inputs': [ 'resources/remoting_strings.grd', @@ -198,6 +194,7 @@ ], }, { + # GN version: //remoting/resources:strings 'action_name': 'remoting_strings', 'variables': { 'grit_grd_file': 'resources/remoting_strings.grd', @@ -205,6 +202,7 @@ 'includes': [ '../build/grit_action.gypi' ], }, { + # GN version: //remoting/resources:copy_locales 'action_name': 'copy_locales', 'variables': { 'copy_output_dir%': '<(PRODUCT_DIR)', @@ -229,6 +227,7 @@ }, # end of target 'remoting_resources' { + # GN version: //remoting/base 'target_name': 'remoting_base', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -264,6 +263,7 @@ }, # end of target 'remoting_base' { + # GN version: //remoting/protocol 'target_name': 'remoting_protocol', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, diff --git a/chromium/remoting/remoting_android.gypi b/chromium/remoting/remoting_android.gypi index 6b2766ea9ba..744b302ae19 100644 --- a/chromium/remoting/remoting_android.gypi +++ b/chromium/remoting/remoting_android.gypi @@ -56,8 +56,16 @@ { 'target_name': 'remoting_apk_manifest', 'type': 'none', - 'sources': [ - 'android/java/AndroidManifest.xml.jinja2', + 'conditions': [ + ['enable_cast==1', { + 'sources': [ + 'android/cast/AndroidManifest.xml.jinja2' + ], + }, { # 'enable_cast != 1' + 'sources': [ + 'android/java/AndroidManifest.xml.jinja2', + ], + }], ], 'rules': [{ 'rule_name': 'generate_manifest', @@ -97,8 +105,23 @@ '../base/base.gyp:base_java', '../ui/android/ui_android.gyp:ui_java', 'remoting_android_resources', + '../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib', + '../third_party/android_tools/android_tools.gyp:android_support_v7_mediarouter_javalib', + '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib', ], 'includes': [ '../build/java.gypi' ], + 'conditions' : [ + ['enable_cast==1', { + 'variables': { + 'additional_src_dirs': [ + 'android/cast', + ], + }, + 'dependencies': [ + 'google_play_services_javalib', + ], + }], + ], }, { 'target_name': 'remoting_apk', @@ -132,7 +155,47 @@ }, 'includes': [ '../build/java_apk.gypi' ], }, # end of target 'remoting_test_apk' - ], # end of 'targets' + ], # end of 'targets' + 'conditions': [ + ['enable_cast==1', { + 'targets': [ + { + # This jar contains the Google Play services library without the + # resources needed for the library to work. See crbug.com/274697 or + # ../third_party/android_tools/android_tools.gyp for more info. + # This target will fail to build unless you have a local version + # of the Google Play services jar. + 'target_name': 'google_play_services_javalib_no_res', + 'type': 'none', + 'variables': { + 'jar_path': 'android/google-play-services_lib/libs/google-play-services.jar', + }, + 'includes': ['../build/java_prebuilt.gypi'], + + }, # end of target 'google_play_services_javalib_no_res' + { + # This target contains the Google Play services library with the + # resources needed. It will fail to build unless you have a local + # version of the Google Play services libary project. + # TODO(aiguha): Solve issue of needing to use local version. Also, + # watch crbug.com/274697. + 'target_name': 'google_play_services_javalib', + 'type': 'none', + 'variables': { + 'java_in_dir': 'android/google-play-services_lib/', + 'R_package': ['com.google.android.gms'], + 'R_package_relpath': ['com/google/android/gms'], + 'has_java_resources': 1, + 'res_v14_verify_only': 1, + }, + 'dependencies': [ + 'google_play_services_javalib_no_res', + ], + 'includes': ['../build/java.gypi'], + }, # end of target 'google_play_services_javalib' + ], # end of targets + }], + ], }], # 'OS=="android"' ['OS=="android"', { diff --git a/chromium/remoting/remoting_client.gypi b/chromium/remoting/remoting_client.gypi index abfc4dcb9f9..786389ae4e7 100644 --- a/chromium/remoting/remoting_client.gypi +++ b/chromium/remoting/remoting_client.gypi @@ -5,6 +5,7 @@ { 'targets': [ { + # GN version: //remoting/client/plugin 'target_name': 'remoting_client_plugin', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -14,6 +15,7 @@ 'dependencies': [ '../net/net.gyp:net', '../ppapi/ppapi.gyp:ppapi_cpp_objects', + '../ppapi/ppapi.gyp:ppapi_internal_module', '../third_party/webrtc/modules/modules.gyp:desktop_capture', '../ui/events/events.gyp:dom4_keycode_converter', 'remoting_base', @@ -28,6 +30,7 @@ }, # end of target 'remoting_client_plugin' { + # GN version: //remoting/client 'target_name': 'remoting_client', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -51,6 +54,7 @@ 'type': 'none', 'actions': [ { + # GN version: //remoting/webapp:html 'action_name': 'Build Remoting Webapp main.html', 'inputs': [ 'webapp/build-html.py', @@ -84,6 +88,22 @@ '--js', '<@(remoting_webapp_wcs_sandbox_html_js_files)', ], }, + { + 'action_name': 'Build Remoting Webapp background.html', + 'inputs': [ + 'webapp/build-html.py', + '<(remoting_webapp_template_background)', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/background.html', + ], + 'action': [ + 'python', 'webapp/build-html.py', + '<(SHARED_INTERMEDIATE_DIR)/background.html', + '<(remoting_webapp_template_background)', + '--js', '<@(remoting_webapp_background_js_files)', + ], + }, ], }, # end of target 'remoting_webapp_html' @@ -113,7 +133,6 @@ 'variables': { 'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2', 'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip', - 'extra_files': [ 'webapp/background.js' ], }, 'conditions': [ ['disable_nacl==0 and disable_nacl_untrusted==0', { @@ -123,7 +142,7 @@ 'variables': { 'webapp_type': 'v2_pnacl', 'extra_files': [ - 'webapp/remoting_client_pnacl.nmf', + 'webapp/crd/remoting_client_pnacl.nmf', '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe', ], }, diff --git a/chromium/remoting/remoting_host.gypi b/chromium/remoting/remoting_host.gypi index 35719249a02..60e0c381c12 100644 --- a/chromium/remoting/remoting_host.gypi +++ b/chromium/remoting/remoting_host.gypi @@ -12,11 +12,19 @@ 'variables': { 'conditions': [ # Remoting host is supported only on Windows, OSX and Linux (with X11). - ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', { + ['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', { + 'enable_me2me_host': 1, + 'enable_it2me_host': 1, 'enable_remoting_host': 1, }, { + 'enable_me2me_host': 0, + 'enable_it2me_host': 0, 'enable_remoting_host': 0, }], + ['chromeos==1 and use_x11==1', { + 'enable_me2me_host': 0, + 'enable_it2me_host': 1, + }], ], }, @@ -39,7 +47,6 @@ '../crypto/crypto.gyp:crypto', '../google_apis/google_apis.gyp:google_apis', '../ipc/ipc.gyp:ipc', - '../third_party/webrtc/modules/modules.gyp:desktop_capture', '../ui/events/events.gyp:dom4_keycode_converter', ], 'defines': [ @@ -65,6 +72,12 @@ 'host/branding.h', 'host/capture_scheduler.cc', 'host/capture_scheduler.h', + 'host/chromeos/aura_desktop_capturer.cc', + 'host/chromeos/aura_desktop_capturer.h', + 'host/chromeos/message_box.cc', + 'host/chromeos/message_box.h', + 'host/chromium_port_allocator_factory.cc', + 'host/chromium_port_allocator_factory.h', 'host/chromoting_host.cc', 'host/chromoting_host.h', 'host/chromoting_host_context.cc', @@ -77,6 +90,8 @@ 'host/client_session.h', 'host/client_session_control.h', 'host/clipboard.h', + 'host/clipboard_aura.cc', + 'host/clipboard_aura.h', 'host/clipboard_mac.mm', 'host/clipboard_win.cc', 'host/clipboard_x11.cc', @@ -87,6 +102,7 @@ 'host/constants_mac.h', 'host/continue_window.cc', 'host/continue_window.h', + 'host/continue_window_chromeos.cc', 'host/continue_window_linux.cc', 'host/continue_window_mac.mm', 'host/continue_window_win.cc', @@ -113,6 +129,7 @@ 'host/desktop_shape_tracker_mac.cc', 'host/desktop_shape_tracker_win.cc', 'host/desktop_shape_tracker_x11.cc', + 'host/disconnect_window_chromeos.cc', 'host/disconnect_window_linux.cc', 'host/disconnect_window_mac.h', 'host/disconnect_window_mac.mm', @@ -138,9 +155,14 @@ 'host/host_exit_codes.h', 'host/host_export.h', 'host/host_extension.h', + 'host/host_extension_session.cc', 'host/host_extension_session.h', + 'host/host_extension_session_manager.cc', + 'host/host_extension_session_manager.h', 'host/host_secret.cc', 'host/host_secret.h', + 'host/host_status_logger.cc', + 'host/host_status_logger.h', 'host/host_status_monitor.h', 'host/host_status_observer.h', 'host/host_status_sender.cc', @@ -164,6 +186,8 @@ 'host/ipc_host_event_logger.h', 'host/ipc_input_injector.cc', 'host/ipc_input_injector.h', + 'host/ipc_mouse_cursor_monitor.cc', + 'host/ipc_mouse_cursor_monitor.h', 'host/ipc_screen_controls.cc', 'host/ipc_screen_controls.h', 'host/ipc_util.h', @@ -187,8 +211,6 @@ 'host/local_input_monitor_linux.cc', 'host/local_input_monitor_mac.mm', 'host/local_input_monitor_win.cc', - 'host/log_to_server.cc', - 'host/log_to_server.h', 'host/logging.h', 'host/logging_posix.cc', 'host/logging_win.cc', @@ -211,6 +233,7 @@ 'host/pin_hash.h', 'host/policy_hack/policy_watcher.cc', 'host/policy_hack/policy_watcher.h', + 'host/policy_hack/policy_watcher_chromeos.cc', 'host/policy_hack/policy_watcher_linux.cc', 'host/policy_hack/policy_watcher_mac.mm', 'host/policy_hack/policy_watcher_win.cc', @@ -218,6 +241,7 @@ 'host/register_support_host_request.h', 'host/remote_input_filter.cc', 'host/remote_input_filter.h', + 'host/remoting_me2me_host.cc', 'host/resizing_host_observer.cc', 'host/resizing_host_observer.h', 'host/sas_injector.h', @@ -227,14 +251,18 @@ 'host/screen_resolution.h', 'host/server_log_entry_host.cc', 'host/server_log_entry_host.h', - 'host/service_urls.cc', - 'host/service_urls.h', 'host/session_manager_factory.cc', 'host/session_manager_factory.h', - 'host/shaped_screen_capturer.cc', - 'host/shaped_screen_capturer.h', + 'host/shaped_desktop_capturer.cc', + 'host/shaped_desktop_capturer.h', 'host/signaling_connector.cc', 'host/signaling_connector.h', + 'host/single_window_desktop_environment.cc', + 'host/single_window_desktop_environment.h', + 'host/single_window_input_injector.h', + 'host/single_window_input_injector_linux.cc', + 'host/single_window_input_injector_mac.cc', + 'host/single_window_input_injector_win.cc', 'host/token_validator_base.cc', 'host/token_validator_base.h', 'host/token_validator_factory_impl.cc', @@ -244,6 +272,10 @@ 'host/usage_stats_consent_win.cc', 'host/username.cc', 'host/username.h', + 'host/video_frame_recorder.cc', + 'host/video_frame_recorder.h', + 'host/video_frame_recorder_host_extension.cc', + 'host/video_frame_recorder_host_extension.h', 'host/video_scheduler.cc', 'host/video_scheduler.h', 'host/win/com_imported_mstscax.tlh', @@ -272,8 +304,6 @@ 'conditions': [ ['OS=="linux"', { 'dependencies': [ - # Always use GTK on Linux, even for Aura builds. - '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:x11', '../build/linux/system.gyp:xext', '../build/linux/system.gyp:xfixes', @@ -287,6 +317,48 @@ ], }, }], + ['OS=="linux" and chromeos==0 and use_ozone==0', { + 'dependencies' : [ + # Always use GTK on Linux, even for Aura builds. + '../build/linux/system.gyp:gtk', + ], + }], + ['chromeos==1', { + 'dependencies' : [ + '../cc/cc.gyp:cc', + '../components/components.gyp:policy_component_common', + '../content/content.gyp:content', + '../ppapi/ppapi_internal.gyp:ppapi_host', + '../skia/skia.gyp:skia', + '../ui/aura/aura.gyp:aura', + '../ui/compositor/compositor.gyp:compositor', + '../ui/events/events.gyp:events', + '../ui/views/views.gyp:views', + ], + 'include_dirs': [ + '../third_party/skia/include/utils', + ], + 'sources!' : [ + 'host/clipboard_x11.cc', + 'host/continue_window_linux.cc', + 'host/disconnect_window.cc', + 'host/disconnect_window_linux.cc', + 'host/policy_hack/policy_watcher_linux.cc', + 'host/remoting_me2me_host.cc', + ] + }, { # chromeos==0 + 'sources!' : [ + 'host/chromeos/aura_desktop_capturer.cc', + 'host/chromeos/aura_desktop_capturer.h', + 'host/chromeos/message_box.cc', + 'host/chromeos/message_box.h', + 'host/clipboard_aura.cc', + 'host/clipboard_aura.h', + 'host/continue_window_chromeos.cc', + 'host/disconnect_window_chromeos.cc', + 'host/policy_hack/policy_watcher_chromeos.cc', + ], + }], ['OS=="mac"', { 'dependencies': [ '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', @@ -348,6 +420,25 @@ 'message': 'Running message compiler on <(RULE_INPUT_PATH)', }], }], + ['use_ash==1', { + 'dependencies': [ + '../ash/ash.gyp:ash', + ], + }], + ['enable_webrtc==1', { + 'dependencies': [ + '../third_party/webrtc/modules/modules.gyp:desktop_capture', + '../third_party/libjingle/libjingle.gyp:libpeerconnection', + ], + 'sources': [ + 'host/cast_extension.cc', + 'host/cast_extension.h', + 'host/cast_extension_session.cc', + 'host/cast_extension_session.h', + 'host/cast_video_capturer_adapter.cc', + 'host/cast_video_capturer_adapter.h', + ], + }], ], }, # end of target 'remoting_host' @@ -359,8 +450,10 @@ '../base/base.gyp:base', ], 'sources': [ - 'host/native_messaging/native_messaging_channel.cc', - 'host/native_messaging/native_messaging_channel.h', + 'host/native_messaging/pipe_messaging_channel.cc', + 'host/native_messaging/pipe_messaging_channel.h', + 'host/native_messaging/native_messaging_pipe.cc', + 'host/native_messaging/native_messaging_pipe.h', 'host/native_messaging/native_messaging_reader.cc', 'host/native_messaging/native_messaging_reader.h', 'host/native_messaging/native_messaging_writer.cc', @@ -369,40 +462,6 @@ }, # end of target 'remoting_native_messaging_base' { - 'target_name': 'remoting_me2me_host_static', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../net/net.gyp:net', - '../third_party/webrtc/modules/modules.gyp:desktop_capture', - 'remoting_base', - 'remoting_breakpad', - 'remoting_host', - 'remoting_protocol', - ], - 'defines': [ - 'VERSION=<(version_full)', - ], - 'sources': [ - 'host/curtain_mode.h', - 'host/curtain_mode_linux.cc', - 'host/curtain_mode_mac.cc', - 'host/curtain_mode_win.cc', - 'host/posix/signal_handler.cc', - 'host/posix/signal_handler.h', - ], - 'conditions': [ - ['os_posix != 1', { - 'sources/': [ - ['exclude', '^host/posix/'], - ], - }], - ], # end of 'conditions' - }, # end of target 'remoting_me2me_host_static' - - { 'target_name': 'remoting_host_setup_base', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -425,6 +484,8 @@ 'host/setup/daemon_controller_delegate_win.h', 'host/setup/daemon_installer_win.cc', 'host/setup/daemon_installer_win.h', + 'host/setup/me2me_native_messaging_host.cc', + 'host/setup/me2me_native_messaging_host.h', 'host/setup/oauth_client.cc', 'host/setup/oauth_client.h', 'host/setup/oauth_helper.cc', @@ -450,30 +511,6 @@ ], }, # end of target 'remoting_host_setup_base' - { - 'target_name': 'remoting_it2me_host_static', - 'type': 'static_library', - 'variables': { 'enable_wexit_time_destructors': 1, }, - 'dependencies': [ - '../base/base.gyp:base_i18n', - '../net/net.gyp:net', - 'remoting_base', - 'remoting_host', - 'remoting_infoplist_strings', - 'remoting_protocol', - 'remoting_resources', - ], - 'defines': [ - 'VERSION=<(version_full)', - ], - 'sources': [ - 'host/it2me/it2me_host.cc', - 'host/it2me/it2me_host.h', - 'host/it2me/it2me_native_messaging_host.cc', - 'host/it2me/it2me_native_messaging_host.h', - ], - }, # end of target 'remoting_it2me_host_static' - # Generates native messaging manifest files. { 'target_name': 'remoting_native_messaging_manifests', @@ -530,7 +567,25 @@ ], }], }, # end of target 'remoting_native_messaging_manifests' - + { + 'target_name': 'remoting_start_host', + 'type': 'executable', + 'dependencies': [ + 'remoting_host_setup_base', + ], + 'sources': [ + 'host/setup/host_starter.cc', + 'host/setup/host_starter.h', + 'host/setup/start_host.cc', + ], + 'conditions': [ + ['OS=="linux" and use_allocator!="none"', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }, # end of target 'remoting_start_host' { 'target_name': 'remoting_infoplist_strings', 'type': 'none', @@ -568,7 +623,73 @@ ], # end of 'targets' }], # 'enable_remoting_host==1' - ['OS!="win" and enable_remoting_host==1', { + ['enable_me2me_host==1', { + 'targets': [ + { + 'target_name': 'remoting_me2me_host_static', + 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'dependencies': [ + '../base/base.gyp:base', + '../base/base.gyp:base_i18n', + '../net/net.gyp:net', + '../third_party/webrtc/modules/modules.gyp:desktop_capture', + 'remoting_base', + 'remoting_breakpad', + 'remoting_host', + 'remoting_protocol', + ], + 'defines': [ + 'VERSION=<(version_full)', + ], + 'sources': [ + 'host/curtain_mode.h', + 'host/curtain_mode_linux.cc', + 'host/curtain_mode_mac.cc', + 'host/curtain_mode_win.cc', + 'host/posix/signal_handler.cc', + 'host/posix/signal_handler.h', + ], + 'conditions': [ + ['os_posix != 1', { + 'sources/': [ + ['exclude', '^host/posix/'], + ], + }], + ], # end of 'conditions' + }, # end of target 'remoting_me2me_host_static' + ] # end of targets + }], # end of enable_me2me_host==1 + + ['enable_it2me_host==1', { + 'targets': [ + { + 'target_name': 'remoting_it2me_host_static', + 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'dependencies': [ + '../base/base.gyp:base_i18n', + '../net/net.gyp:net', + 'remoting_base', + 'remoting_host', + 'remoting_infoplist_strings', + 'remoting_protocol', + 'remoting_resources', + ], + 'defines': [ + 'VERSION=<(version_full)', + ], + 'sources': [ + 'host/it2me/it2me_host.cc', + 'host/it2me/it2me_host.h', + 'host/it2me/it2me_native_messaging_host.cc', + 'host/it2me/it2me_native_messaging_host.h', + ], + }, # end of target 'remoting_it2me_host_static' + ] # end of targets + }], # end of 'enable_it2me_host==1' + + ['OS!="win" and enable_me2me_host==1', { 'targets': [ { 'target_name': 'remoting_me2me_host', @@ -593,7 +714,6 @@ 'sources': [ 'host/host_main.cc', 'host/host_main.h', - 'host/remoting_me2me_host.cc', ], 'conditions': [ ['OS=="mac"', { @@ -679,8 +799,6 @@ 'VERSION=<(version_full)', ], 'sources': [ - 'host/setup/me2me_native_messaging_host.cc', - 'host/setup/me2me_native_messaging_host.h', 'host/setup/me2me_native_messaging_host_entry_point.cc', 'host/setup/me2me_native_messaging_host_main.cc', 'host/setup/me2me_native_messaging_host_main.h', @@ -749,6 +867,11 @@ }], # OS=mac ], }, # end of target 'remoting_me2me_native_messaging_host' + ], # targets + }], # end of OS!="win" and enable_me2me_host==1 + + ['OS!="win" and enable_it2me_host==1 and chromeos==0', { + 'targets': [ { 'target_name': 'remoting_it2me_native_messaging_host', 'type': 'executable', @@ -772,7 +895,7 @@ 'host/it2me/it2me_native_messaging_host_main.h', ], 'conditions': [ - ['OS=="linux"', { + ['OS=="linux" and chromeos==0 and use_ozone==0', { 'dependencies': [ # Always use GTK on Linux, even for Aura builds. '../build/linux/system.gyp:gtk', @@ -844,7 +967,7 @@ ], }, # end of target 'remoting_it2me_native_messaging_host' ], # end of 'targets' - }], # OS!="win" + }], # # end of OS!="win" and enable_it2me_host==1 ], # end of 'conditions' } diff --git a/chromium/remoting/remoting_host_linux.gypi b/chromium/remoting/remoting_host_linux.gypi index 0701e470fef..31bbc943ec7 100644 --- a/chromium/remoting/remoting_host_linux.gypi +++ b/chromium/remoting/remoting_host_linux.gypi @@ -4,7 +4,7 @@ { 'conditions': [ - ['OS=="linux" and branding=="Chrome" and enable_remoting_host==1', { + ['OS=="linux" and branding=="Chrome" and enable_remoting_host==1 and chromeos==0', { 'variables': { 'build_deb_script': 'host/installer/linux/build-deb.sh', 'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])', @@ -81,57 +81,41 @@ ['OS=="linux" and enable_remoting_host==1', { 'targets': [ # Linux breakpad processing - { - 'target_name': 'remoting_linux_symbols', - 'type': 'none', - 'conditions': [ - ['linux_dump_symbols==1', { - 'actions': [ - { - 'action_name': 'dump_symbols', - 'inputs': [ - '<(DEPTH)/build/linux/dump_app_syms', - '<(PRODUCT_DIR)/dump_syms', - '<(PRODUCT_DIR)/remoting_me2me_host', - ], - 'outputs': [ - '<(PRODUCT_DIR)/remoting_me2me_host.breakpad.<(target_arch)', - ], - 'action': ['<(DEPTH)/build/linux/dump_app_syms', - '<(PRODUCT_DIR)/dump_syms', - '<(linux_strip_binary)', - '<(PRODUCT_DIR)/remoting_me2me_host', - '<@(_outputs)'], - 'message': 'Dumping breakpad symbols to <(_outputs)', - 'process_outputs_as_sources': 1, - }, - ], - 'dependencies': [ - 'remoting_me2me_host', - '../breakpad/breakpad.gyp:dump_syms', - ], - }], # 'linux_dump_symbols==1' - ], # end of 'conditions' - }, # end of target 'linux_symbols' - { - 'target_name': 'remoting_start_host', - 'type': 'executable', - 'dependencies': [ - 'remoting_host_setup_base', - ], - 'sources': [ - 'host/setup/host_starter.cc', - 'host/setup/host_starter.h', - 'host/setup/start_host.cc', - ], - 'conditions': [ - ['use_allocator!="none"', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], - }, # end of target 'remoting_start_host' + # The following target is disabled temporarily because it was failing + # on build bots. See crbug.com/386886 . + # + # { + # 'target_name': 'remoting_linux_symbols', + # 'type': 'none', + # 'conditions': [ + # ['linux_dump_symbols==1', { + # 'actions': [ + # { + # 'action_name': 'dump_symbols', + # 'inputs': [ + # '<(DEPTH)/build/linux/dump_app_syms', + # '<(PRODUCT_DIR)/dump_syms', + # '<(PRODUCT_DIR)/remoting_me2me_host', + # ], + # 'outputs': [ + # '<(PRODUCT_DIR)/remoting_me2me_host.breakpad.<(target_arch)', + # ], + # 'action': ['<(DEPTH)/build/linux/dump_app_syms', + # '<(PRODUCT_DIR)/dump_syms', + # '<(linux_strip_binary)', + # '<(PRODUCT_DIR)/remoting_me2me_host', + # '<@(_outputs)'], + # 'message': 'Dumping breakpad symbols to <(_outputs)', + # 'process_outputs_as_sources': 1, + # }, + # ], + # 'dependencies': [ + # 'remoting_me2me_host', + # '../breakpad/breakpad.gyp:dump_syms', + # ], + # }], # 'linux_dump_symbols==1' + # ], # end of 'conditions' + # }, # end of target 'remoting_linux_symbols' ], # end of 'targets' }], # 'OS=="linux"' diff --git a/chromium/remoting/remoting_host_win.gypi b/chromium/remoting/remoting_host_win.gypi index 7182b82bb6d..d91505a5643 100644 --- a/chromium/remoting/remoting_host_win.gypi +++ b/chromium/remoting/remoting_host_win.gypi @@ -199,15 +199,8 @@ 'host/desktop_process_main.cc', 'host/host_main.cc', 'host/host_main.h', - 'host/ipc_constants.cc', - 'host/ipc_constants.h', 'host/it2me/it2me_native_messaging_host_main.cc', 'host/it2me/it2me_native_messaging_host_main.h', - 'host/remoting_me2me_host.cc', - 'host/sas_injector.h', - 'host/sas_injector_win.cc', - 'host/setup/me2me_native_messaging_host.cc', - 'host/setup/me2me_native_messaging_host.h', 'host/setup/me2me_native_messaging_host_main.cc', 'host/setup/me2me_native_messaging_host_main.h', 'host/verify_config_window_win.cc', @@ -257,6 +250,16 @@ '/EXPORT:DllUnregisterServer=PsDllUnregisterServer,PRIVATE', ], }, + 'conditions': [ + ['clang==1', { + # atlapp.h contains a global "using namespace WTL;". + # TODO: Remove once remoting/host/verify_config_window_win.h no + # longer depends on atlapp.h, http://crbug.com/5027 + 'VCCLCompilerTool': { + 'AdditionalOptions': ['-Wno-header-hygiene'], + }, + }], + ], }, }, # end of target 'remoting_core' { @@ -509,6 +512,7 @@ 'python', 'tools/zip2msi.py', '--wix_path', '<(wix_path)', '--intermediate_dir', '<(INTERMEDIATE_DIR)/installation', + '--target_arch', '<(target_arch)', '<(RULE_INPUT_PATH)', '<@(_outputs)', ], diff --git a/chromium/remoting/remoting_nacl.gyp b/chromium/remoting/remoting_nacl.gyp index 81dc8da902b..b9000ba1e90 100644 --- a/chromium/remoting/remoting_nacl.gyp +++ b/chromium/remoting/remoting_nacl.gyp @@ -108,7 +108,7 @@ '../third_party/libvpx/libvpx_nacl.gyp:libvpx_nacl', '../third_party/libwebm/libwebm_nacl.gyp:libwebm_nacl', '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl', - '../third_party/openssl/openssl_nacl.gyp:openssl_nacl', + '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl', '../third_party/opus/opus_nacl.gyp:opus_nacl', 'remoting_proto_nacl', 'remoting_webrtc_nacl', @@ -121,8 +121,8 @@ '<@(remoting_protocol_sources)', ], 'sources!': [ - 'base/url_request_context.cc', - 'jingle_glue/chromium_socket_factory.cc', + 'base/url_request_context_getter.cc', + 'protocol/chromium_socket_factory.cc', ], # Include normalizing_input_filter_mac.cc excluded by the filename @@ -146,8 +146,6 @@ 'build_glibc': 0, 'build_newlib': 0, 'build_pnacl_newlib': 1, - 'enable_x86_32': 0, - 'enable_x86_64': 0, 'extra_deps_pnacl_newlib': [ '>(tc_lib_dir_pnacl_newlib)/libbase_i18n_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libbase_nacl.a', @@ -160,7 +158,7 @@ '>(tc_lib_dir_pnacl_newlib)/libjingle_p2p_constants_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libmedia_yuv_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libmodp_b64_nacl.a', - '>(tc_lib_dir_pnacl_newlib)/libopenssl_nacl.a', + '>(tc_lib_dir_pnacl_newlib)/libboringssl_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libopus_nacl.a', '>(tc_lib_dir_pnacl_newlib)/libppapi.a', '>(tc_lib_dir_pnacl_newlib)/libppapi_cpp.a', @@ -196,7 +194,7 @@ '../third_party/libwebm/libwebm_nacl.gyp:libwebm_nacl', '../third_party/libyuv/libyuv_nacl.gyp:libyuv_nacl', '../third_party/modp_b64/modp_b64_nacl.gyp:modp_b64_nacl', - '../third_party/openssl/openssl_nacl.gyp:openssl_nacl', + '../third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl', '../url/url_nacl.gyp:url_nacl', 'remoting_client_plugin_lib_nacl', 'remoting_proto_nacl', @@ -227,7 +225,7 @@ '-lexpat_nacl', '-lmodp_b64_nacl', '-lopus_nacl', - '-lopenssl_nacl', + '-lboringssl_nacl', '-licui18n_nacl', '-licuuc_nacl', '-licudata_nacl', diff --git a/chromium/remoting/remoting_srcs.gypi b/chromium/remoting/remoting_srcs.gypi index 0277d552b78..213d108a4d2 100644 --- a/chromium/remoting/remoting_srcs.gypi +++ b/chromium/remoting/remoting_srcs.gypi @@ -5,6 +5,8 @@ { 'variables': { 'remoting_base_sources': [ + # Note: sources list duplicated in GN build. + # See remoting/base/BUILD.gn 'base/auth_token_util.cc', 'base/auth_token_util.h', 'base/auto_thread.cc', @@ -30,11 +32,13 @@ 'base/running_average.cc', 'base/running_average.h', 'base/scoped_sc_handle_win.h', + 'base/service_urls.cc', + 'base/service_urls.h', 'base/socket_reader.cc', 'base/socket_reader.h', 'base/typed_buffer.h', - 'base/url_request_context.cc', - 'base/url_request_context.h', + 'base/url_request_context_getter.cc', + 'base/url_request_context_getter.h', 'base/util.cc', 'base/util.h', 'base/vlog_net_log.cc', @@ -58,6 +62,8 @@ 'codec/video_decoder_vpx.cc', 'codec/video_decoder_vpx.h', 'codec/video_encoder.h', + 'codec/video_encoder_helper.cc', + 'codec/video_encoder_helper.h', 'codec/video_encoder_verbatim.cc', 'codec/video_encoder_verbatim.h', 'codec/video_encoder_vpx.cc', @@ -65,23 +71,8 @@ ], 'remoting_protocol_sources': [ - 'jingle_glue/chromium_port_allocator.cc', - 'jingle_glue/chromium_port_allocator.h', - 'jingle_glue/chromium_socket_factory.cc', - 'jingle_glue/chromium_socket_factory.h', - 'jingle_glue/iq_sender.cc', - 'jingle_glue/iq_sender.h', - 'jingle_glue/jingle_info_request.cc', - 'jingle_glue/jingle_info_request.h', - 'jingle_glue/network_settings.cc', - 'jingle_glue/network_settings.h', - 'jingle_glue/server_log_entry.cc', - 'jingle_glue/server_log_entry.h', - 'jingle_glue/signal_strategy.h', - 'jingle_glue/socket_util.cc', - 'jingle_glue/socket_util.h', - 'jingle_glue/xmpp_signal_strategy.cc', - 'jingle_glue/xmpp_signal_strategy.h', + # Note: sources list duplicated in GN build. + # See remoting/protocol/BUILD.gn 'protocol/audio_reader.cc', 'protocol/audio_reader.h', 'protocol/audio_stub.h', @@ -100,11 +91,17 @@ 'protocol/channel_dispatcher_base.h', 'protocol/channel_multiplexer.cc', 'protocol/channel_multiplexer.h', + 'protocol/chromium_port_allocator.cc', + 'protocol/chromium_port_allocator.h', + 'protocol/chromium_socket_factory.cc', + 'protocol/chromium_socket_factory.h', 'protocol/client_control_dispatcher.cc', 'protocol/client_control_dispatcher.h', 'protocol/client_event_dispatcher.cc', 'protocol/client_event_dispatcher.h', 'protocol/client_stub.h', + 'protocol/client_video_dispatcher.cc', + 'protocol/client_video_dispatcher.h', 'protocol/clipboard_echo_filter.cc', 'protocol/clipboard_echo_filter.h', 'protocol/clipboard_filter.cc', @@ -118,12 +115,15 @@ 'protocol/connection_to_host.h', 'protocol/content_description.cc', 'protocol/content_description.h', + 'protocol/datagram_channel_factory.h', 'protocol/errors.h', 'protocol/host_control_dispatcher.cc', 'protocol/host_control_dispatcher.h', 'protocol/host_event_dispatcher.cc', 'protocol/host_event_dispatcher.h', 'protocol/host_stub.h', + 'protocol/host_video_dispatcher.cc', + 'protocol/host_video_dispatcher.h', 'protocol/input_event_tracker.cc', 'protocol/input_event_tracker.h', 'protocol/input_filter.cc', @@ -158,6 +158,8 @@ 'protocol/negotiating_client_authenticator.h', 'protocol/negotiating_host_authenticator.cc', 'protocol/negotiating_host_authenticator.h', + 'protocol/network_settings.cc', + 'protocol/network_settings.h', 'protocol/pairing_authenticator_base.cc', 'protocol/pairing_authenticator_base.h', 'protocol/pairing_client_authenticator.cc', @@ -166,16 +168,19 @@ 'protocol/pairing_host_authenticator.h', 'protocol/pairing_registry.cc', 'protocol/pairing_registry.h', - 'protocol/protobuf_video_reader.cc', - 'protocol/protobuf_video_reader.h', - 'protocol/protobuf_video_writer.cc', - 'protocol/protobuf_video_writer.h', + 'protocol/pseudotcp_channel_factory.cc', + 'protocol/pseudotcp_channel_factory.h', + 'protocol/secure_channel_factory.cc', + 'protocol/secure_channel_factory.h', 'protocol/session.h', 'protocol/session_config.cc', 'protocol/session_config.h', 'protocol/session_manager.h', + 'protocol/socket_util.cc', + 'protocol/socket_util.h', 'protocol/ssl_hmac_channel_authenticator.cc', 'protocol/ssl_hmac_channel_authenticator.h', + 'protocol/stream_channel_factory.h', 'protocol/third_party_authenticator_base.cc', 'protocol/third_party_authenticator_base.h', 'protocol/third_party_client_authenticator.cc', @@ -187,14 +192,23 @@ 'protocol/transport.h', 'protocol/v2_authenticator.cc', 'protocol/v2_authenticator.h', - 'protocol/video_reader.cc', - 'protocol/video_reader.h', 'protocol/video_stub.h', - 'protocol/video_writer.cc', - 'protocol/video_writer.h', + 'signaling/iq_sender.cc', + 'signaling/iq_sender.h', + 'signaling/jingle_info_request.cc', + 'signaling/jingle_info_request.h', + 'signaling/log_to_server.cc', + 'signaling/log_to_server.h', + 'signaling/server_log_entry.cc', + 'signaling/server_log_entry.h', + 'signaling/signal_strategy.h', + 'signaling/xmpp_signal_strategy.cc', + 'signaling/xmpp_signal_strategy.h', ], 'remoting_client_sources': [ + # Note: sources list duplicated in GN build. + # See remoting/client/BUILD.gn 'client/audio_decode_scheduler.cc', 'client/audio_decode_scheduler.h', 'client/audio_player.cc', @@ -203,10 +217,10 @@ 'client/chromoting_client.h', 'client/chromoting_stats.cc', 'client/chromoting_stats.h', - 'client/client_config.cc', - 'client/client_config.h', 'client/client_context.cc', 'client/client_context.h', + 'client/client_status_logger.cc', + 'client/client_status_logger.h', 'client/client_user_interface.h', 'client/frame_consumer.h', 'client/frame_consumer_proxy.cc', @@ -214,8 +228,6 @@ 'client/frame_producer.h', 'client/key_event_mapper.cc', 'client/key_event_mapper.h', - 'client/log_to_server.cc', - 'client/log_to_server.h', 'client/server_log_entry_client.cc', 'client/server_log_entry_client.h', 'client/software_video_renderer.cc', @@ -226,6 +238,8 @@ ], 'remoting_client_plugin_sources': [ + # Note: sources list duplicated in GN build. + # See remoting/client/plugin/BUILD.gn 'client/plugin/chromoting_instance.cc', 'client/plugin/chromoting_instance.h', 'client/plugin/delegating_signal_strategy.cc', @@ -236,6 +250,8 @@ 'client/plugin/normalizing_input_filter_cros.h', 'client/plugin/normalizing_input_filter_mac.cc', 'client/plugin/normalizing_input_filter_mac.h', + 'client/plugin/pepper_address_resolver.cc', + 'client/plugin/pepper_address_resolver.h', 'client/plugin/pepper_audio_player.cc', 'client/plugin/pepper_audio_player.h', 'client/plugin/pepper_input_handler.cc', diff --git a/chromium/remoting/remoting_test.gypi b/chromium/remoting/remoting_test.gypi index ac4feff9949..a01692999b9 100644 --- a/chromium/remoting/remoting_test.gypi +++ b/chromium/remoting/remoting_test.gypi @@ -4,6 +4,69 @@ { 'targets': [ + { + 'target_name': 'remoting_test_common', + 'type': 'static_library', + 'dependencies': [ + '../base/base.gyp:base', + '../net/net.gyp:net_test_support', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + 'remoting_base', + 'remoting_client', + 'remoting_host', + 'remoting_protocol', + 'remoting_resources', + ], + 'sources': [ + 'host/fake_desktop_capturer.cc', + 'host/fake_desktop_capturer.h', + 'host/fake_desktop_environment.cc', + 'host/fake_desktop_environment.h', + 'host/fake_host_status_monitor.h', + 'host/fake_mouse_cursor_monitor.cc', + 'host/fake_mouse_cursor_monitor.h', + 'host/policy_hack/fake_policy_watcher.cc', + 'host/policy_hack/fake_policy_watcher.h', + 'host/policy_hack/mock_policy_callback.cc', + 'host/policy_hack/mock_policy_callback.h', + 'protocol/fake_authenticator.cc', + 'protocol/fake_authenticator.h', + 'protocol/fake_datagram_socket.cc', + 'protocol/fake_datagram_socket.h', + 'protocol/fake_session.cc', + 'protocol/fake_session.h', + 'protocol/fake_stream_socket.cc', + 'protocol/fake_stream_socket.h', + 'protocol/protocol_mock_objects.cc', + 'protocol/protocol_mock_objects.h', + 'signaling/fake_signal_strategy.cc', + 'signaling/fake_signal_strategy.h', + 'signaling/mock_signal_strategy.cc', + 'signaling/mock_signal_strategy.h', + 'test/fake_network_dispatcher.cc', + 'test/fake_network_dispatcher.h', + 'test/fake_network_manager.cc', + 'test/fake_network_manager.h', + 'test/fake_port_allocator.cc', + 'test/fake_port_allocator.h', + 'test/fake_socket_factory.cc', + 'test/fake_socket_factory.h', + 'test/leaky_bucket.cc', + 'test/leaky_bucket.h', + ], + 'conditions': [ + ['enable_remoting_host == 0', { + 'dependencies!': [ + 'remoting_host', + ], + 'sources/': [ + ['exclude', '^host/'], + ] + }], + ], + }, + # Remoting unit tests { 'target_name': 'remoting_unittests', @@ -32,6 +95,7 @@ 'remoting_native_messaging_base', 'remoting_protocol', 'remoting_resources', + 'remoting_test_common', ], 'defines': [ 'VERSION=<(version_full)', @@ -40,7 +104,6 @@ '../testing/gmock/include', ], 'sources': [ - '../chrome/test/base/run_all_remoting_unittests.cc', 'base/auth_token_util_unittest.cc', 'base/auto_thread_task_runner_unittest.cc', 'base/auto_thread_unittest.cc', @@ -50,11 +113,13 @@ 'base/rate_counter_unittest.cc', 'base/resources_unittest.cc', 'base/rsa_key_pair_unittest.cc', + 'base/run_all_unittests.cc', 'base/running_average_unittest.cc', 'base/test_rsa_key_pair.h', 'base/typed_buffer_unittest.cc', 'base/util_unittest.cc', 'client/audio_player_unittest.cc', + 'client/client_status_logger_unittest.cc', 'client/key_event_mapper_unittest.cc', 'client/plugin/normalizing_input_filter_cros_unittest.cc', 'client/plugin/normalizing_input_filter_mac_unittest.cc', @@ -63,24 +128,33 @@ 'codec/codec_test.cc', 'codec/codec_test.h', 'codec/video_decoder_vpx_unittest.cc', + 'codec/video_encoder_helper_unittest.cc', 'codec/video_encoder_verbatim_unittest.cc', 'codec/video_encoder_vpx_unittest.cc', 'host/audio_silence_detector_unittest.cc', 'host/branding.cc', 'host/branding.h', 'host/capture_scheduler_unittest.cc', + 'host/chromeos/aura_desktop_capturer_unittest.cc', 'host/chromoting_host_context_unittest.cc', 'host/chromoting_host_unittest.cc', 'host/client_session_unittest.cc', + 'host/clipboard_aura_unittest.cc', 'host/config_file_watcher_unittest.cc', 'host/daemon_process_unittest.cc', 'host/desktop_process_unittest.cc', 'host/desktop_shape_tracker_unittest.cc', + 'host/fake_desktop_capturer.cc', + 'host/fake_desktop_capturer.h', + 'host/fake_host_extension.cc', + 'host/fake_host_extension.h', + 'host/fake_host_status_monitor.h', 'host/gnubby_auth_handler_posix_unittest.cc', 'host/heartbeat_sender_unittest.cc', 'host/host_change_notification_listener_unittest.cc', + 'host/host_extension_session_manager_unittest.cc', 'host/host_mock_objects.cc', - 'host/host_status_monitor_fake.h', + 'host/host_status_logger_unittest.cc', 'host/host_status_sender_unittest.cc', 'host/ipc_desktop_environment_unittest.cc', 'host/it2me/it2me_native_messaging_host_unittest.cc', @@ -89,22 +163,15 @@ 'host/linux/unicode_to_keysym_unittest.cc', 'host/linux/x_server_clipboard_unittest.cc', 'host/local_input_monitor_unittest.cc', - 'host/log_to_server_unittest.cc', 'host/native_messaging/native_messaging_reader_unittest.cc', 'host/native_messaging/native_messaging_writer_unittest.cc', 'host/pairing_registry_delegate_linux_unittest.cc', 'host/pairing_registry_delegate_win_unittest.cc', 'host/pin_hash_unittest.cc', - 'host/policy_hack/fake_policy_watcher.cc', - 'host/policy_hack/fake_policy_watcher.h', - 'host/policy_hack/mock_policy_callback.cc', - 'host/policy_hack/mock_policy_callback.h', 'host/policy_hack/policy_watcher_unittest.cc', 'host/register_support_host_request_unittest.cc', 'host/remote_input_filter_unittest.cc', 'host/resizing_host_observer_unittest.cc', - 'host/screen_capturer_fake.cc', - 'host/screen_capturer_fake.h', 'host/screen_resolution_unittest.cc', 'host/server_log_entry_host_unittest.cc', 'host/setup/me2me_native_messaging_host.cc', @@ -112,36 +179,25 @@ 'host/setup/me2me_native_messaging_host_unittest.cc', 'host/setup/oauth_helper_unittest.cc', 'host/setup/pin_validator_unittest.cc', - 'host/shaped_screen_capturer_unittest.cc', + 'host/shaped_desktop_capturer_unittest.cc', 'host/token_validator_factory_impl_unittest.cc', + 'host/video_frame_recorder_unittest.cc', 'host/video_scheduler_unittest.cc', 'host/win/rdp_client_unittest.cc', 'host/win/worker_process_launcher.cc', 'host/win/worker_process_launcher.h', 'host/win/worker_process_launcher_unittest.cc', - 'jingle_glue/chromium_socket_factory_unittest.cc', - 'jingle_glue/fake_signal_strategy.cc', - 'jingle_glue/fake_signal_strategy.h', - 'jingle_glue/iq_sender_unittest.cc', - 'jingle_glue/mock_objects.cc', - 'jingle_glue/mock_objects.h', - 'jingle_glue/network_settings_unittest.cc', - 'jingle_glue/server_log_entry_unittest.cc', - 'jingle_glue/server_log_entry_unittest.h', 'protocol/authenticator_test_base.cc', 'protocol/authenticator_test_base.h', 'protocol/buffered_socket_writer_unittest.cc', 'protocol/channel_multiplexer_unittest.cc', + 'protocol/chromium_socket_factory_unittest.cc', 'protocol/clipboard_echo_filter_unittest.cc', 'protocol/clipboard_filter_unittest.cc', 'protocol/connection_tester.cc', 'protocol/connection_tester.h', 'protocol/connection_to_client_unittest.cc', 'protocol/content_description_unittest.cc', - 'protocol/fake_authenticator.cc', - 'protocol/fake_authenticator.h', - 'protocol/fake_session.cc', - 'protocol/fake_session.h', 'protocol/input_event_tracker_unittest.cc', 'protocol/input_filter_unittest.cc', 'protocol/jingle_messages_unittest.cc', @@ -151,13 +207,18 @@ 'protocol/monitored_video_stub_unittest.cc', 'protocol/mouse_input_filter_unittest.cc', 'protocol/negotiating_authenticator_unittest.cc', + 'protocol/network_settings_unittest.cc', 'protocol/pairing_registry_unittest.cc', 'protocol/ppapi_module_stub.cc', - 'protocol/protocol_mock_objects.cc', - 'protocol/protocol_mock_objects.h', 'protocol/ssl_hmac_channel_authenticator_unittest.cc', 'protocol/third_party_authenticator_unittest.cc', 'protocol/v2_authenticator_unittest.cc', + 'signaling/fake_signal_strategy.cc', + 'signaling/fake_signal_strategy.h', + 'signaling/iq_sender_unittest.cc', + 'signaling/log_to_server_unittest.cc', + 'signaling/server_log_entry_unittest.cc', + 'signaling/server_log_entry_unittest.h', ], 'conditions': [ [ 'OS=="win"', { @@ -174,40 +235,6 @@ ], }, }], - [ 'OS=="mac" or (OS=="linux" and chromeos==0)', { - # Javascript unittests are disabled on CrOS because they cause - # valgrind and test errors. - # - # Javascript unittests are disabled on Windows because they add a - # dependency on 'common_constants' which (only on Windows) requires - # additional dependencies: - # '../content/content.gyp:content_common', - # 'installer_util', - # These targets are defined in .gypi files that would need to be - # included here: - # '../chrome/chrome_common.gypi', - # '../chrome/chrome_installer.gypi', - # '../chrome/chrome_installer_util.gypi', - # But we can't do that because ninja will complain about multiple - # target definitions. - # TODO(garykac): Move installer_util into a proper .gyp file so that - # it can be included in multiple .gyp files. - 'includes': [ - '../chrome/js_unittest_rules.gypi', - ], - 'dependencies': [ - '../chrome/common_constants.gyp:common_constants', - '../v8/tools/gyp/v8.gyp:v8', - ], - 'sources': [ - '../chrome/test/base/v8_unit_test.cc', - '../chrome/test/base/v8_unit_test.h', - 'webapp/browser_globals.gtestjs', - 'webapp/all_js_load.gtestjs', - 'webapp/format_iq.gtestjs', - '<@(remoting_webapp_all_js_files)', - ], - }], [ 'OS=="android"', { 'dependencies!': [ 'remoting_client_plugin', @@ -221,13 +248,14 @@ [ 'chromeos==0', { 'sources!': [ 'client/plugin/normalizing_input_filter_cros_unittest.cc', + 'host/chromeos/aura_desktop_capturer_unittest.cc', + 'host/clipboard_aura_unittest.cc', ], }], ['enable_remoting_host == 0', { 'dependencies!': [ 'remoting_host', 'remoting_host_setup_base', - 'remoting_it2me_host_static', 'remoting_native_messaging_base', ], 'sources/': [ @@ -236,6 +264,14 @@ ['exclude', '^base/resources_unittest\\.cc$'], ] }], + ['enable_it2me_host == 0', { + 'dependencies!': [ + 'remoting_it2me_host_static', + ], + 'sources/': [ + ['exclude', '^host/it2me/'], + ] + }], [ 'OS == "linux" and use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', @@ -246,6 +282,9 @@ { 'target_name': 'remoting_browser_test_resources', 'type': 'none', + 'variables': { + 'zip_script': '../build/android/gyp/zip.py', + }, 'copies': [ { 'destination': '<(PRODUCT_DIR)', @@ -254,6 +293,150 @@ ], }, ], #end of copies + 'actions': [ + { + # Store the browser test resources into a zip file so there is a + # consistent filename to reference for build archiving (i.e. in + # FILES.cfg). + 'action_name': 'zip browser test resources', + 'inputs': [ + '<(zip_script)', + '<@(remoting_webapp_js_browser_test_files)' + ], + 'outputs': [ + '<(PRODUCT_DIR)/remoting-browser-tests.zip', + ], + 'action': [ + 'python', + '<(zip_script)', + '--input-dir', 'webapp/browser_test', + '--output', '<@(_outputs)', + ], + }, + ], # end of actions }, # end of target 'remoting_browser_test_resources' + { + 'target_name': 'remoting_webapp_unittest', + 'type': 'none', + 'variables': { + 'output_dir': '<(PRODUCT_DIR)/remoting/unittests', + 'webapp_js_files': [ + '<@(remoting_webapp_main_html_js_files)', + '<@(remoting_webapp_js_wcs_sandbox_files)', + '<@(remoting_webapp_background_js_files)', + ] + }, + 'copies': [ + { + 'destination': '<(output_dir)/qunit', + 'files': [ + '../third_party/qunit/src/browser_test_harness.js', + '../third_party/qunit/src/qunit.css', + '../third_party/qunit/src/qunit.js', + ], + }, + { + 'destination': '<(output_dir)/blanketjs', + 'files': [ + '../third_party/blanketjs/src/blanket.js', + '../third_party/blanketjs/src/qunit_adapter.js', + ], + }, + { + 'destination': '<(output_dir)/sinonjs', + 'files': [ + '../third_party/sinonjs/src/sinon.js', + '../third_party/sinonjs/src/sinon-qunit.js', + ], + }, + { + 'destination': '<(output_dir)', + 'files': [ + '<@(webapp_js_files)', + '<@(remoting_webapp_unittest_js_files)', + '<@(remoting_webapp_unittest_additional_files)' + ], + }, + ], + 'actions': [ + { + 'action_name': 'Build Remoting Webapp unittest.html', + 'inputs': [ + 'webapp/build-html.py', + '<(remoting_webapp_unittest_template_main)', + '<@(webapp_js_files)', + '<@(remoting_webapp_unittest_js_files)' + ], + 'outputs': [ + '<(output_dir)/unittest.html', + ], + 'action': [ + 'python', 'webapp/build-html.py', + '<@(_outputs)', + '<(remoting_webapp_unittest_template_main)', + # GYP automatically removes subsequent duplicated command line + # arguments. Therefore, the excludejs flag must be set before the + # instrumentedjs flag or else GYP will ignore the files in the + # exclude list. + '--exclude-js', '<@(remoting_webapp_unittest_exclude_files)', + '--js', '<@(remoting_webapp_unittest_js_files)', + '--instrument-js', '<@(webapp_js_files)', + ], + }, + ], + }, # end of target 'remoting_webapp_js_unittest' ], # end of targets + + 'conditions': [ + ['enable_remoting_host==1', { + 'targets': [ + # Remoting performance tests + { + 'target_name': 'remoting_perftests', + 'type': '<(gtest_target_type)', + 'dependencies': [ + '../base/base.gyp:base', + '../base/base.gyp:test_support_base', + '../testing/gtest.gyp:gtest', + '../third_party/webrtc/modules/modules.gyp:desktop_capture', + '../third_party/libjingle/libjingle.gyp:libjingle', + 'remoting_base', + 'remoting_test_common', + ], + 'defines': [ + 'VERSION=<(version_full)', + ], + 'include_dirs': [ + '../testing/gmock/include', + ], + 'sources': [ + 'base/run_all_unittests.cc', + 'codec/codec_test.cc', + 'codec/codec_test.h', + 'codec/video_encoder_vpx_perftest.cc', + 'test/protocol_perftest.cc', + ], + 'conditions': [ + [ 'OS=="mac" or (OS=="linux" and chromeos==0)', { + # RunAllTests calls chrome::RegisterPathProvider() under Mac and + # Linux, so we need the chrome_common.gypi dependency. + 'dependencies': [ + '../chrome/common_constants.gyp:common_constants', + ], + }], + [ 'OS=="android"', { + 'dependencies': [ + '../testing/android/native_test.gyp:native_test_native_code', + ], + }], + [ 'OS == "linux" and use_allocator!="none"', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], # end of 'conditions' + }, # end of target 'remoting_perftests' + ] + }] + ] } diff --git a/chromium/remoting/remoting_webapp.gypi b/chromium/remoting/remoting_webapp.gypi index ea498b655a4..57d0c36cdc4 100644 --- a/chromium/remoting/remoting_webapp.gypi +++ b/chromium/remoting/remoting_webapp.gypi @@ -11,6 +11,7 @@ 'generated_html_files': [ '<(SHARED_INTERMEDIATE_DIR)/main.html', '<(SHARED_INTERMEDIATE_DIR)/wcs_sandbox.html', + '<(SHARED_INTERMEDIATE_DIR)/background.html', ], }, 'dependencies': [ @@ -20,7 +21,7 @@ 'conditions': [ ['run_jscompile != 0', { 'variables': { - 'success_stamp': '<(PRODUCT_DIR)/remoting_webapp_jscompile.stamp', + 'success_stamp': '<(PRODUCT_DIR)/<(_target_name)_jscompile.stamp', }, 'actions': [ { @@ -47,7 +48,7 @@ 'action_name': 'Build Remoting WebApp', 'inputs': [ 'webapp/build-webapp.py', - 'webapp/manifest.json.jinja2', + 'webapp/crd/manifest.json.jinja2', '<(chrome_version_path)', '<(remoting_version_path)', '<@(generated_html_files)', @@ -65,7 +66,7 @@ '<(version_full)', '<(output_dir)', '<(zip_path)', - 'webapp/manifest.json.jinja2', + 'webapp/crd/manifest.json.jinja2', '<(webapp_type)', '<@(generated_html_files)', '<@(remoting_webapp_files)', diff --git a/chromium/remoting/remoting_webapp_files.gypi b/chromium/remoting/remoting_webapp_files.gypi index ba94d408105..c0e3bfd6fff 100644 --- a/chromium/remoting/remoting_webapp_files.gypi +++ b/chromium/remoting/remoting_webapp_files.gypi @@ -23,111 +23,159 @@ # These files aren't included directly from main.html. They are # referenced from the manifest.json file (appsv1 only). 'remoting_webapp_js_auth_v1_files': [ - 'webapp/cs_third_party_auth_trampoline.js', # client to host - 'webapp/cs_oauth2_trampoline.js', # Google account + 'webapp/crd/js/cs_third_party_auth_trampoline.js', # client to host + 'webapp/crd/js/cs_oauth2_trampoline.js', # Google account ], # Auth (client to host) JavaScript files. 'remoting_webapp_js_auth_client2host_files': [ - 'webapp/third_party_host_permissions.js', - 'webapp/third_party_token_fetcher.js', + '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/identity.js', - 'webapp/oauth2.js', - 'webapp/oauth2_api.js', + 'webapp/crd/js/identity.js', + 'webapp/crd/js/oauth2.js', + 'webapp/crd/js/oauth2_api.js', ], # Client JavaScript files. 'remoting_webapp_js_client_files': [ - 'webapp/client_plugin.js', + 'webapp/crd/js/client_plugin.js', + 'webapp/crd/js/client_plugin_impl.js', # TODO(garykac) For client_screen: # * Split out pin/access code stuff into separate file. # * Move client logic into session_connector - 'webapp/client_screen.js', - 'webapp/client_session.js', - 'webapp/clipboard.js', - 'webapp/media_source_renderer.js', - 'webapp/session_connector.js', - 'webapp/smart_reconnector.js', + 'webapp/crd/js/client_screen.js', + 'webapp/crd/js/client_session.js', + 'webapp/crd/js/clipboard.js', + 'webapp/crd/js/hangout_session.js', + 'webapp/crd/js/media_source_renderer.js', + 'webapp/crd/js/session_connector.js', + 'webapp/crd/js/session_connector_impl.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', - 'webapp/error.js', - 'webapp/event_handlers.js', - 'webapp/plugin_settings.js', + 'webapp/base/js/base.js', + 'webapp/base/js/platform.js', + 'webapp/crd/js/error.js', + 'webapp/crd/js/event_handlers.js', + 'webapp/crd/js/plugin_settings.js', # TODO(garykac) Split out UI client stuff from remoting.js. - 'webapp/remoting.js', - 'webapp/typecheck.js', - 'webapp/xhr.js', + 'webapp/crd/js/remoting.js', + 'webapp/crd/js/typecheck.js', + 'webapp/crd/js/xhr.js', ], # Host JavaScript files. # Includes both it2me and me2me files. 'remoting_webapp_js_host_files': [ - 'webapp/host_controller.js', - 'webapp/host_dispatcher.js', - 'webapp/host_it2me_dispatcher.js', - 'webapp/host_it2me_native_messaging.js', - 'webapp/host_native_messaging.js', - 'webapp/host_session.js', + 'webapp/crd/js/host_controller.js', + 'webapp/crd/js/host_daemon_facade.js', + 'webapp/crd/js/it2me_host_facade.js', + 'webapp/crd/js/host_session.js', ], # Logging and stats JavaScript files. 'remoting_webapp_js_logging_files': [ - 'webapp/format_iq.js', - 'webapp/log_to_server.js', - 'webapp/server_log_entry.js', - 'webapp/stats_accumulator.js', + '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', ], # UI JavaScript files. 'remoting_webapp_js_ui_files': [ - 'webapp/butter_bar.js', - 'webapp/connection_stats.js', - 'webapp/feedback.js', - 'webapp/fullscreen.js', - 'webapp/fullscreen_v1.js', - 'webapp/fullscreen_v2.js', - 'webapp/l10n.js', - 'webapp/menu_button.js', - 'webapp/ui_mode.js', - 'webapp/toolbar.js', - 'webapp/window_frame.js', + 'webapp/crd/js/butter_bar.js', + 'webapp/crd/js/connection_stats.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/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', ], # UI files for controlling the local machine as a host. 'remoting_webapp_js_ui_host_control_files': [ - 'webapp/host_screen.js', - 'webapp/host_setup_dialog.js', - 'webapp/host_install_dialog.js', - 'webapp/paired_client_manager.js', + 'webapp/crd/js/host_screen.js', + 'webapp/crd/js/host_setup_dialog.js', + 'webapp/crd/js/host_install_dialog.js', + 'webapp/crd/js/host_installer.js', + 'webapp/crd/js/paired_client_manager.js', ], # UI files for displaying (in the client) info about available hosts. 'remoting_webapp_js_ui_host_display_files': [ - 'webapp/host.js', - 'webapp/host_list.js', - 'webapp/host_settings.js', - 'webapp/host_table_entry.js', + 'webapp/crd/js/host.js', + 'webapp/crd/js/host_list.js', + 'webapp/crd/js/host_settings.js', + 'webapp/crd/js/host_table_entry.js', ], - # Remoting WCS container JavaScript files. - 'remoting_webapp_js_wcs_container_files': [ - 'webapp/wcs_sandbox_container.js', + # Remoting signaling files. + 'remoting_webapp_js_signaling_files': [ + 'webapp/crd/js/signal_strategy.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', ], # Remoting WCS sandbox JavaScript files. 'remoting_webapp_js_wcs_sandbox_files': [ - 'webapp/wcs.js', - 'webapp/wcs_loader.js', - 'webapp/wcs_sandbox_content.js', - 'webapp/xhr_proxy.js', + 'webapp/crd/js/wcs.js', + 'webapp/crd/js/wcs_loader.js', + 'webapp/crd/js/wcs_sandbox_content.js', + 'webapp/crd/js/xhr_proxy.js', ], # gnubby authentication JavaScript files. 'remoting_webapp_js_gnubby_auth_files': [ - 'webapp/gnubby_auth_handler.js', + 'webapp/crd/js/gnubby_auth_handler.js', + ], + # cast extension handler JavaScript files. + 'remoting_webapp_js_cast_extension_files': [ + 'webapp/crd/js/cast_extension_handler.js', ], # browser test JavaScript files. 'remoting_webapp_js_browser_test_files': [ 'webapp/browser_test/browser_test.js', + 'webapp/browser_test/bump_scroll_browser_test.js', 'webapp/browser_test/cancel_pin_browser_test.js', 'webapp/browser_test/invalid_pin_browser_test.js', + 'webapp/browser_test/mock_client_plugin.js', + 'webapp/browser_test/mock_session_connector.js', + 'webapp/browser_test/mock_signal_strategy.js', + 'webapp/browser_test/scrollbar_browser_test.js', 'webapp/browser_test/update_pin_browser_test.js', ], + # These product files are excluded from our JavaScript unittest + 'remoting_webapp_unittest_exclude_files': [ + # background.js is where the onLoad handler is defined, which + # makes it the entry point of the background page. + 'webapp/crd/js/background.js', + # event_handlers.js is where the onLoad handler is defined, which + # makes it the entry point of the webapp. + 'webapp/crd/js/event_handlers.js', + ], + # The unit test cases for the webapp + 'remoting_webapp_unittest_js_files': [ + 'webapp/js_proto/chrome_proto.js', + 'webapp/unittests/chrome_mocks.js', + 'webapp/unittests/base_unittest.js', + 'webapp/unittests/it2me_helpee_channel_unittest.js', + 'webapp/unittests/it2me_helper_channel_unittest.js', + 'webapp/unittests/it2me_service_unittest.js', + 'webapp/unittests/l10n_unittest.js', + 'webapp/unittests/menu_button_unittest.js', + 'webapp/unittests/xmpp_connection_unittest.js', + 'webapp/unittests/xmpp_login_handler_unittest.js', + 'webapp/unittests/xmpp_stream_parser_unittest.js', + ], + 'remoting_webapp_unittest_additional_files': [ + 'webapp/crd/html/menu_button.css', + ], + 'remoting_webapp_unittest_template_main': + 'webapp/crd/html/template_unittest.html', + # The JavaScript files required by main.html. 'remoting_webapp_main_html_js_files': [ # Include the core files first as it is required by the other files. @@ -137,28 +185,55 @@ '<@(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_logging_files)', '<@(remoting_webapp_js_ui_files)', '<@(remoting_webapp_js_ui_host_control_files)', '<@(remoting_webapp_js_ui_host_display_files)', - '<@(remoting_webapp_js_wcs_container_files)', + '<@(remoting_webapp_js_signaling_files)', # Uncomment this line to include browser test files in the web app # to expedite debugging or local development. # '<@(remoting_webapp_js_browser_test_files)' ], + # The JavaScript files that are used in the background page. + 'remoting_webapp_background_js_files': [ + 'webapp/base/js/base.js', + 'webapp/base/js/message_window_helper.js', + 'webapp/base/js/message_window_manager.js', + 'webapp/crd/js/app_launcher.js', + 'webapp/crd/js/background.js', + 'webapp/crd/js/client_session.js', + 'webapp/crd/js/error.js', + 'webapp/crd/js/host_installer.js', + 'webapp/crd/js/host_session.js', + 'webapp/crd/js/it2me_helpee_channel.js', + 'webapp/crd/js/it2me_helper_channel.js', + 'webapp/crd/js/it2me_host_facade.js', + 'webapp/crd/js/it2me_service.js', + 'webapp/crd/js/l10n.js', + 'webapp/crd/js/oauth2.js', + 'webapp/crd/js/oauth2_api.js', + 'webapp/crd/js/plugin_settings.js', + 'webapp/crd/js/typecheck.js', + 'webapp/crd/js/xhr.js', + ], + # The JavaScript files required by wcs_sandbox.html. 'remoting_webapp_wcs_sandbox_html_js_files': [ '<@(remoting_webapp_js_wcs_sandbox_files)', - 'webapp/error.js', - 'webapp/plugin_settings.js', + 'webapp/crd/js/error.js', + 'webapp/crd/js/plugin_settings.js', ], # All the JavaScript files required by the webapp. 'remoting_webapp_all_js_files': [ # JS files for main.html. '<@(remoting_webapp_main_html_js_files)', + '<@(remoting_webapp_background_js_files)', + # JS files for message_window.html + 'webapp/base/js/message_window.js', # JS files for wcs_sandbox.html. # Use r_w_js_wcs_sandbox_files instead of r_w_wcs_sandbox_html_js_files # so that we don't double include error.js and plugin_settings.js. @@ -175,10 +250,12 @@ 'resources/icon_close.webp', 'resources/icon_cross.webp', 'resources/icon_disconnect.webp', + 'resources/icon_fullscreen.webp', 'resources/icon_help.webp', 'resources/icon_host.webp', 'resources/icon_maximize_restore.webp', 'resources/icon_minimize.webp', + 'resources/icon_options.webp', 'resources/icon_pencil.webp', 'resources/icon_warning.webp', 'resources/infographic_my_computers.webp', @@ -186,15 +263,17 @@ 'resources/plus.webp', 'resources/reload.webp', 'resources/tick.webp', - 'webapp/connection_stats.css', - 'webapp/main.css', - 'webapp/menu_button.css', - 'webapp/open_sans.css', - 'webapp/open_sans.woff', - 'webapp/scale-to-fit.webp', - 'webapp/spinner.gif', - 'webapp/toolbar.css', - 'webapp/window_frame.css', + 'webapp/base/html/connection_stats.css', + 'webapp/base/html/message_window.html', + 'webapp/base/html/main.css', + 'webapp/base/html/message_window.css', + 'webapp/base/resources/open_sans.css', + 'webapp/base/resources/open_sans.woff', + 'webapp/base/resources/spinner.gif', + 'webapp/crd/html/toolbar.css', + 'webapp/crd/html/menu_button.css', + 'webapp/crd/html/window_frame.css', + 'webapp/crd/resources/scale-to-fit.webp', ], 'remoting_webapp_files': [ @@ -205,34 +284,37 @@ # These template files are used to construct the webapp html files. 'remoting_webapp_template_main': - 'webapp/html/template_main.html', + 'webapp/crd/html/template_main.html', 'remoting_webapp_template_wcs_sandbox': - 'webapp/html/template_wcs_sandbox.html', + 'webapp/base/html/template_wcs_sandbox.html', + + 'remoting_webapp_template_background': + 'webapp/crd/html/template_background.html', 'remoting_webapp_template_files': [ - 'webapp/html/butterbar.html', - 'webapp/html/client_plugin.html', - 'webapp/html/dialog_auth.html', - 'webapp/html/dialog_client_connect_failed.html', - 'webapp/html/dialog_client_connecting.html', - 'webapp/html/dialog_client_host_needs_upgrade.html', - 'webapp/html/dialog_client_pin_prompt.html', - 'webapp/html/dialog_client_session_finished.html', - 'webapp/html/dialog_client_third_party_auth.html', - 'webapp/html/dialog_client_unconnected.html', - 'webapp/html/dialog_confirm_host_delete.html', - 'webapp/html/dialog_connection_history.html', - 'webapp/html/dialog_host.html', - 'webapp/html/dialog_host_install.html', - 'webapp/html/dialog_host_setup.html', - 'webapp/html/dialog_manage_pairings.html', - 'webapp/html/dialog_token_refresh_failed.html', - 'webapp/html/toolbar.html', - 'webapp/html/ui_header.html', - 'webapp/html/ui_it2me.html', - 'webapp/html/ui_me2me.html', - 'webapp/html/window_frame.html', + 'webapp/base/html/client_plugin.html', + 'webapp/base/html/dialog_auth.html', + 'webapp/crd/html/butterbar.html', + 'webapp/crd/html/dialog_client_connect_failed.html', + 'webapp/crd/html/dialog_client_connecting.html', + 'webapp/crd/html/dialog_client_host_needs_upgrade.html', + 'webapp/crd/html/dialog_client_pin_prompt.html', + 'webapp/crd/html/dialog_client_session_finished.html', + 'webapp/crd/html/dialog_client_third_party_auth.html', + 'webapp/crd/html/dialog_client_unconnected.html', + 'webapp/crd/html/dialog_confirm_host_delete.html', + 'webapp/crd/html/dialog_connection_history.html', + 'webapp/crd/html/dialog_host.html', + 'webapp/crd/html/dialog_host_install.html', + 'webapp/crd/html/dialog_host_setup.html', + 'webapp/crd/html/dialog_manage_pairings.html', + 'webapp/crd/html/dialog_token_refresh_failed.html', + 'webapp/crd/html/toolbar.html', + 'webapp/crd/html/ui_header.html', + 'webapp/crd/html/ui_it2me.html', + 'webapp/crd/html/ui_me2me.html', + 'webapp/crd/html/window_frame.html', ], }, |