[Chromoting] The desktop process now creates a pre-connected pipe and passes (with some help of the…

remoting/remoting.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
@@ skipping 579 matching lines @@
             'STRICT',
             'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"',
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)',
           ],
           'dependencies': [
             '../base/base.gyp:base',
             'remoting_breakpad',
             'remoting_elevated_controller',
+            'remoting_host',
             'remoting_host_logging',
             'remoting_protocol',
             'remoting_version_resources',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_controller_version.rc',
             'host/pin_hash.cc',
             'host/pin_hash.h',
-            'host/usage_stats_consent.h',
-            'host/usage_stats_consent_win.cc',
             'host/verify_config_window_win.cc',
             'host/verify_config_window_win.h',
             'host/win/elevated_controller.cc',
             'host/win/elevated_controller.h',
             'host/win/elevated_controller.rc',
             'host/win/elevated_controller_module.cc',
             'host/win/omaha.cc',
             'host/win/omaha.h',
           ],
           'link_settings': {
@@ skipping 20 matching lines @@
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_static',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../ipc/ipc.gyp:ipc',
             '../net/net.gyp:net',
             'remoting_base',
             'remoting_breakpad',
+            'remoting_host',
             'remoting_host_logging',
             'remoting_version_resources',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc',
             'base/scoped_sc_handle_win.h',
             'host/chromoting_messages.cc',
             'host/chromoting_messages.h',
             'host/config_file_watcher.cc',
             'host/config_file_watcher.h',
             'host/daemon_process.cc',
             'host/daemon_process.h',
             'host/daemon_process_win.cc',
             'host/desktop_session.cc',
             'host/desktop_session.h',
             'host/desktop_session_win.cc',
             'host/desktop_session_win.h',
             'host/host_exit_codes.h',
             'host/ipc_consts.cc',
             'host/ipc_consts.h',
-            'host/usage_stats_consent.h',
-            'host/usage_stats_consent_win.cc',
             'host/win/host_service.cc',
             'host/win/host_service.h',
             'host/win/host_service.rc',
             'host/win/host_service_resource.h',
-            'host/win/launch_process_with_token.cc',
-            'host/win/launch_process_with_token.h',
             'host/win/omaha.cc',
             'host/win/omaha.h',
             'host/win/unprivileged_process_delegate.cc',
             'host/win/unprivileged_process_delegate.h',
             'host/win/worker_process_launcher.cc',
             'host/win/worker_process_launcher.h',
             'host/win/wts_console_monitor.h',
             'host/win/wts_console_observer.h',
             'host/win/wts_console_session_process_driver.cc',
             'host/win/wts_console_session_process_driver.h',
@@ skipping 217 matching lines @@
                 '<@(_generated_files_dst)',
                 '--defs',
                 '<@(_defs)',
               ],
             },
           ],  # actions
         }, # end of target 'remoting_me2me_host_archive'
       ],  # end of 'targets'
     }],  # '<(wix_path) != ""'
 
-    ['remoting_multi_process != 0', {
-      'targets': [
-        {
-          'target_name': 'remoting_desktop',
-          'type': 'executable',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            'remoting_base',
-            'remoting_breakpad',
-            'remoting_host',
-            'remoting_host_logging',
-            'remoting_version_resources',
-            '../base/base.gyp:base',
-            '../ipc/ipc.gyp:ipc',
-          ],
-          'sources': [
-            'host/desktop_process.cc',
-            'host/desktop_process.h',
-            'host/host_ui.rc',
-            'host/usage_stats_consent.h',
-            'host/usage_stats_consent_win.cc',
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc',
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lcomctl32.lib',
-            ],
-          },
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'AdditionalOptions': [
-                "\"/manifestdependency:type='win32' "
-                    "name='Microsoft.Windows.Common-Controls' "
-                    "version='6.0.0.0' "
-                    "processorArchitecture='*' "
-                    "publicKeyToken='6595b64144ccf1df' language='*'\"",
-              ],
-              'conditions': [
-                ['buildtype == "Official" and remoting_multi_process != 0', {
-                  'AdditionalOptions': [
-                    "\"/MANIFESTUAC:level='requireAdministrator' "
-                        "uiAccess='true'\"",
-                  ],
-                }],
-              ],
-              # 2 == /SUBSYSTEM:WINDOWS
-              'SubSystem': '2',
-            },
-          },
-        },  # end of target 'remoting_desktop'
-      ],
-    }],  # 'remoting_multi_process != 0'
-
   ],  # end of 'conditions'
 
   'targets': [
     {
       'target_name': 'remoting_breakpad',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '../base/base.gyp:base',
       ],
@@ skipping 50 matching lines @@
         'client/plugin/pepper_view.cc',
         'client/plugin/pepper_view.h',
         'client/plugin/pepper_util.cc',
         'client/plugin/pepper_util.h',
         'client/plugin/pepper_xmpp_proxy.cc',
         'client/plugin/pepper_xmpp_proxy.h',
       ],
     },  # end of target 'remoting_client_plugin'
 
     {
+      'target_name': 'remoting_desktop',

[Sergey Ulanov, 2012/10/24 20:12:01]

Do we need to compile this to a separate binary for desktop process? I think we
should use to apply the same approach that chrome uses: one single binary is
shared between all chrome processes. This will allow to reduce downloadable
package size and also reduce memory consumption by the daemons.

[alexeypa (please no reviews), 2012/10/24 21:41:51]

Yes. It should have "level='requireAdministrator'" in the binary's manifest
which means that the binary cannot be launched using CreateProcess.
I agree that having a single binary is preferred to multiple different binaries.
Right now however I cannot really merge them. Once refactoring is done, I will
be able to merge daemon and host/network binaries. The desktop one will have to
be separate.

Another thing that we can do is to have a couple of launchers and a single DLL
loaded by the launchers. We still need two launchers because of the manifest
issue above.

[Sergey Ulanov, 2012/10/24 23:46:28]

Ok, maybe add TODO somewhere for now?
I see. Is it possible to have one small shim binary with that attribute in the
manifest that would just launch the main binary that doesn't have that
attribute?

[alexeypa (please no reviews), 2012/10/24 23:58:20]

http://crbug.com/157727
Maybe. I'm not sure how SendSAS() function checks the manifest. This will also
make us to spawn three processes in order to launch the desktop process in a
session.

+      'type': 'executable',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'defines': [
+        'REMOTING_MULTI_PROCESS',
+      ],
+      'dependencies': [
+        'remoting_base',
+        'remoting_breakpad',
+        'remoting_host',
+        'remoting_host_logging',
+        '../base/base.gyp:base',
+        '../ipc/ipc.gyp:ipc',
+      ],
+      'sources': [
+        'host/desktop_process.cc',
+        'host/desktop_process.h',
+        'host/desktop_process_main.cc',
+        'host/desktop_session_agent.cc',
+        'host/desktop_session_agent.h',
+        'host/desktop_session_agent_posix.cc',
+        'host/desktop_session_agent_win.cc',
+      ],
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': [
+            'remoting_version_resources',
+          ],
+          'sources': [
+            'host/host_ui.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lcomctl32.lib',
+            ],
+          },
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'AdditionalOptions': [
+                "\"/manifestdependency:type='win32' "
+                    "name='Microsoft.Windows.Common-Controls' "
+                    "version='6.0.0.0' "
+                    "processorArchitecture='*' "
+                    "publicKeyToken='6595b64144ccf1df' language='*'\"",
+              ],
+              'conditions': [
+                ['buildtype == "Official"', {
+                  'AdditionalOptions': [
+                    "\"/MANIFESTUAC:level='requireAdministrator' "
+                        "uiAccess='true'\"",
+                  ],
+                }],
+              ],
+              # 2 == /SUBSYSTEM:WINDOWS
+              'SubSystem': '2',
+            },
+          },
+        }],
+      ],
+    },  # end of target 'remoting_desktop'
+
+    {
       'target_name': 'remoting_host_event_logger',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         'remoting_base',
       ],
       'sources': [
         'host/host_event_logger.h',
         'host/host_event_logger_posix.cc',
         'host/host_event_logger_win.cc',
@@ skipping 439 matching lines @@
         'host/continue_window_mac.mm',
         'host/continue_window_win.cc',
         'host/desktop_environment.cc',
         'host/desktop_environment.h',
         'host/desktop_environment_factory.cc',
         'host/desktop_environment_factory.h',
         'host/desktop_resizer.h',
         'host/desktop_resizer_linux.cc',
         'host/desktop_resizer_win.cc',
         'host/desktop_resizer_mac.cc',
+        'host/desktop_session_connector.h',
         'host/differ.cc',
         'host/differ.h',
         'host/disconnect_window.h',
         'host/disconnect_window_gtk.cc',
         'host/disconnect_window_mac.h',
         'host/disconnect_window_mac.mm',
         'host/disconnect_window_win.cc',
         'host/dns_blackhole_checker.cc',
         'host/dns_blackhole_checker.h',
         'host/event_executor.h',
@@ skipping 17 matching lines @@
         'host/host_port_allocator.h',
         'host/host_secret.cc',
         'host/host_secret.h',
         'host/host_status_observer.h',
         'host/host_user_interface.cc',
         'host/host_user_interface.h',
         'host/in_memory_host_config.cc',
         'host/in_memory_host_config.h',
         'host/ipc_consts.cc',
         'host/ipc_consts.h',
+        'host/ipc_desktop_environment_factory.cc',
+        'host/ipc_desktop_environment_factory.h',
+        'host/ipc_desktop_environment.cc',
+        'host/ipc_desktop_environment.h',
         'host/it2me_host_user_interface.cc',
         'host/it2me_host_user_interface.h',
         'host/json_host_config.cc',
         'host/json_host_config.h',
         'host/linux/x11_util.cc',
         'host/linux/x11_util.h',
         'host/linux/x_server_clipboard.cc',
         'host/linux/x_server_clipboard.h',
         'host/linux/x_server_pixel_buffer.cc',
         'host/linux/x_server_pixel_buffer.h',
@@ skipping 35 matching lines @@
         'host/service_client.cc',
         'host/service_client.h',
         'host/session_manager_factory.cc',
         'host/session_manager_factory.h',
         'host/signaling_connector.cc',
         'host/signaling_connector.h',
         'host/ui_strings.cc',
         'host/ui_strings.h',
         'host/url_request_context.cc',
         'host/url_request_context.h',
+        'host/usage_stats_consent.h',
+        'host/usage_stats_consent_win.cc',
         'host/user_authenticator.h',
         'host/user_authenticator_linux.cc',
         'host/user_authenticator_mac.cc',
         'host/user_authenticator_win.cc',
         'host/video_frame_capturer.h',
         'host/video_frame_capturer_fake.cc',
         'host/video_frame_capturer_fake.h',
         'host/video_frame_capturer_helper.cc',
         'host/video_frame_capturer_helper.h',
         'host/video_frame_capturer_linux.cc',
         'host/video_frame_capturer_mac.mm',
         'host/video_frame_capturer_win.cc',
         'host/vlog_net_log.cc',
         'host/vlog_net_log.h',
         'host/win/desktop.cc',
         'host/win/desktop.h',
+        'host/win/launch_process_with_token.cc',
+        'host/win/launch_process_with_token.h',
         'host/win/omaha.cc',
         'host/win/omaha.h',
         'host/win/scoped_thread_desktop.cc',
         'host/win/scoped_thread_desktop.h',
         'host/win/session_desktop_environment_factory.cc',
         'host/win/session_desktop_environment_factory.h',
         'host/win/session_event_executor.cc',
         'host/win/session_event_executor.h',
       ],
       'conditions': [
@@ skipping 136 matching lines @@
         'host/config_file_watcher.h',
         'host/curtain_mode.h',
         'host/curtaining_host_observer.h',
         'host/curtaining_host_observer.cc',
         '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',
         'host/remoting_me2me_host.cc',
-        'host/usage_stats_consent.h',
-        'host/usage_stats_consent_win.cc',
       ],
       'conditions': [
         ['os_posix != 1', {
           'sources/': [
             ['exclude', '^host/posix/'],
           ],
         }],
         ['OS=="mac"', {
           'mac_bundle': 1,
           'variables': {
@@ skipping 14 matching lines @@
           ],
         }],
         ['OS=="win"', {
           'product_name': 'remoting_host',
           'dependencies': [
             'remoting_version_resources',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_me2me_version.rc',
-            'host/desktop_session_connector.h',
             'host/host_ui.rc',
-            'host/ipc_desktop_environment_factory.cc',
-            'host/ipc_desktop_environment_factory.h',
-            'host/ipc_desktop_environment.cc',
-            'host/ipc_desktop_environment.h',
           ],
           'link_settings': {
             'libraries': [
               '-lcomctl32.lib',
             ],
           },
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalOptions': [
                 "\"/manifestdependency:type='win32' "
@@ skipping 260 matching lines @@
         'host/branding.cc',
         'host/branding.h',
         'host/chromoting_host_context_unittest.cc',
         'host/chromoting_host_unittest.cc',
         'host/client_session_unittest.cc',
         'host/config_file_watcher.cc',
         'host/config_file_watcher.h',
         'host/daemon_process.cc',
         'host/daemon_process.h',
         'host/daemon_process_unittest.cc',
+        'host/desktop_process.cc',
+        'host/desktop_process.h',
+        'host/desktop_process_unittest.cc',
         'host/desktop_session.cc',
         'host/desktop_session.h',
+        'host/desktop_session_agent.cc',
+        'host/desktop_session_agent.h',
+        'host/desktop_session_agent_posix.cc',
+        'host/desktop_session_agent_win.cc',
         'host/differ_block_unittest.cc',
         'host/differ_unittest.cc',
         'host/heartbeat_sender_unittest.cc',
         'host/host_key_pair_unittest.cc',
         'host/host_mock_objects.cc',
         'host/host_mock_objects.h',
         'host/json_host_config_unittest.cc',
         'host/linux/x_server_clipboard_unittest.cc',
         'host/log_to_server_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_recorder_unittest.cc',
         'host/server_log_entry_unittest.cc',
         'host/setup/oauth_helper_unittest.cc',
         'host/setup/pin_validator_unittest.cc',
         'host/test_key_pair.h',
         'host/video_frame_capturer_helper_unittest.cc',
         'host/video_frame_capturer_mac_unittest.cc',
         'host/video_frame_capturer_unittest.cc',
-        'host/win/launch_process_with_token.cc',
-        'host/win/launch_process_with_token.h',
         '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',
         'protocol/authenticator_test_base.cc',
@@ skipping 86 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }