[Chromoting] Adding the desktop integration binary to the host installation on Windows.

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 75c7ad21cb3bdacb9f09f96e9507ab8fc14d8aa5..5ad09b62ebe827a7ab9a7e96e7b3e1bcaeb9ab4e 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -29,7 +29,7 @@
     # Use consistent strings across all platforms.
     # These values must match host/plugin/constants.h
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
-    'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_DESCRIPTION@")',
+    'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_DESCRIPTION@")',
     'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
 
     'conditions': [
@@ -207,7 +207,7 @@
           'ENABLE_REMOTING_AUDIO',
         ],
       }],
-      ['remoting_multi_process == 1', {
+      ['remoting_multi_process != 0', {
         'defines': [
           'REMOTING_MULTI_PROCESS',
         ],
@@ -310,7 +310,7 @@
           ],
           'variables': {
             'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
-            'host_service_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_SERVICE_FILE_NAME@")',
+            'host_service_name': '<!(python <(version_py_path) -f <(branding_path) -t "@DAEMON_FILE_NAME@")',
             'host_uninstaller_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_NAME@")',
             'bundle_prefix': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_PREFIX@")',
           },
@@ -651,6 +651,7 @@
           },
           'sources': [
             'host/plugin/host_plugin.ver',
+            'host/remoting_desktop.ver',
             'host/remoting_me2me_host.ver',
             'host/win/elevated_controller.ver',

[garykac, 2012/09/05 22:40:42]

controller.ver?

[alexeypa (please no reviews), 2012/09/05 23:24:02]

Done.

             'host/win/host_service.ver',

[garykac, 2012/09/05 22:40:42]

daemon.ver?

[alexeypa (please no reviews), 2012/09/05 23:24:02]

Done.

@@ -714,8 +715,24 @@
           ],
           'wix_defines' : [
             '-dBranding=<(branding)',
+            '-dRemotingMultiProcess=<(remoting_multi_process)',
+          ],
+          'wix_inputs' : [
+            '<(PRODUCT_DIR)/remoting_host_controller.exe',

[garykac, 2012/09/05 22:40:42]

remoting_controller?

[alexeypa (please no reviews), 2012/09/05 23:24:02]

Cannot touch file names yet.

+            '<(PRODUCT_DIR)/remoting_me2me_host.exe',

[garykac, 2012/09/05 22:40:42]

remoting_host_me2me for consistency with you renaming this elsewhere

[Sergey Ulanov, 2012/09/05 23:03:57]

FYI on linux we renamed main host binary to chrome-remote-desktop-host. Maybe
use the same name here for consistency. Or remoting_host.exe should work fine.
It's best to avoid using "me2me" as part of the name.

[alexeypa (please no reviews), 2012/09/05 23:24:02]

Cannot touch file names yet.

+            '<(PRODUCT_DIR)/remoting_service.exe',
+            '<(sas_dll_path)/sas.dll',
+            'resources/chromoting.ico',
           ],
           'conditions': [
+            ['remoting_multi_process != 0', {
+              'dependencies': [
+                'remoting_desktop',
+              ],
+              'wix_inputs' : [
+                '<(PRODUCT_DIR)/remoting_desktop.exe',
+              ],
+            }],
             ['buildtype == "Official"', {
               'wix_defines': [
                 '-dOfficialBuild=1',
@@ -727,11 +744,7 @@
               'rule_name': 'candle_and_light',
               'extension': 'wxs',
               'inputs': [
-                '<(PRODUCT_DIR)/remoting_host_controller.exe',
-                '<(PRODUCT_DIR)/remoting_me2me_host.exe',
-                '<(PRODUCT_DIR)/remoting_service.exe',
-                '<(sas_dll_path)/sas.dll',
-                'resources/chromoting.ico',
+                '<@(_wix_inputs)',
                 'tools/candle_and_light.py',
               ],
               'outputs': [
@@ -802,6 +815,60 @@
       ],  # 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_version_resources',
+            '../base/base.gyp:base',
+            '../ipc/ipc.gyp:ipc',
+          ],
+          'sources': [
+            'host/branding.cc',
+            'host/branding.h',
+            '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': [
@@ -1501,7 +1568,7 @@
                     "publicKeyToken='6595b64144ccf1df' language='*'\"",
               ],
               'conditions': [
-                ['buildtype == "Official"', {
+                ['buildtype == "Official" and remoting_multi_process == 0', {
                   'AdditionalOptions': [
                     "\"/MANIFESTUAC:level='requireAdministrator' "
                         "uiAccess='true'\"",