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

remoting/host/win/chromoting.wxs

 <?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define EventSourceName = "chromoting" ?>
   <?define ServiceName = "chromoting" ?>
 
   <!-- TODO(alexeypa): There strings should be localized,
        see http://crbug.com/121785 -->
   <?if $(var.Branding) ~= Chrome ?>
     <?define ChromotingHost = "Chrome Remote Desktop Host" ?>
@@ skipping 117 matching lines @@
           <Directory Id="common_app_data_google" Name="Google">
             <Directory Id="config_files" Name="Chrome Remote Desktop"/>
           </Directory>
         <?else?>
           <Directory Id="config_files" Name="Chromoting"/>
         <?endif?>
       </Directory>
     </Directory>
 
     <DirectoryRef Id="binaries" FileSource="$(var.FileSource)">
-      <Component Id="sas.dll" Guid="*">
+      <Component Id="sas" Guid="*">
         <File Id="sas.dll"
               DiskId="1"
               Name="sas.dll"
               Source="$(var.SasDllPath)"
               Vital="yes"/>
       </Component>
 
-      <Component Id="remoting_service" Guid="*">
+      <?ifdef RemotingMultiProcess ?>
+        <Component Id="remoting_desktop" Guid="*">
+          <File Id="remoting_desktop.exe"

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

Shouldn't these targets be called _daemon as well?

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

No, this one is installing the desktop integration process binary. So it is
"desktop".

+                DiskId="1"
+                KeyPath="yes"
+                Name="remoting_desktop.exe"
+                Vital="yes"/>
+        </Component>
+      <?endif?>
+
+      <Component Id="remoting_daemon" Guid="*">
         <File Id="remoting_service.exe"
               DiskId="1"
               KeyPath="yes"
               Name="remoting_service.exe"
               Vital="yes"/>
 
         <ServiceInstall Id="install_service"
                         Type="ownProcess"
                         Vital="yes"
                         Name="$(var.ServiceName)"
                         DisplayName="[chromoting_service_display_name]"
                         Description="[chromoting_service_description]"
                         Arguments="--host-config=&quot;[config_files]host.json&quot;"
                         Start="demand"
                         Account="LocalSystem"
                         ErrorControl="ignore"
                         Interactive="no" />
 
         <ServiceControl Id="start_service"
                         Stop="both"
                         Remove="uninstall"
                         Name="$(var.ServiceName)"
                         Wait="yes" />
       </Component>
 
-      <Component Id="remoting_me2me_host" Guid="*">
+      <Component Id="remoting_host" Guid="*">

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

Why not remoting_host_me2me?

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

Done.

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

Actually - not done, since Sergey suggested to avoid me2me.

         <File Id="remoting_me2me_host.exe"
               DiskId="1"
               Name="remoting_me2me_host.exe"
               Vital="yes"/>
         <util:EventSource xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
                           Name="$(var.EventSourceName)"
                           Log="Application"
                           CategoryCount="1"
                           CategoryMessageFile="[#remoting_me2me_host.exe]"
                           EventMessageFile="[#remoting_me2me_host.exe]"
@@ skipping 19 matching lines @@
                            Name="pv"
                            Value="$(var.Version)"/>
 
             <RegistryValue Type="string"
                            Name="name"
                            Value="$(var.ChromotingHost)"/>
           </RegistryKey>
         </Component>
       <?endif?>
 
-      <Component Id="service_controller" Guid="*">
+      <Component Id="remoting_controller" Guid="*">
         <File Id="$(var.ControllerBinary)"
               DiskId="1"
               Name="$(var.ControllerBinary)"
               Vital="yes"/>
 
         <RegistryKey Root="HKLM"
                      Key="SOFTWARE\Classes">
           <RegistryKey Key="AppId">
             <RegistryKey Key="$(var.ControllerAppid)" Action="create">
               <RegistryValue Type="string"
@@ skipping 179 matching lines @@
     <CustomAction Id="set_service_description_xp"
                   Property="chromoting_service_description"
                   Value="$(var.ChromotingServiceDescription)" />
 
     <UIRef Id="WixUI_ErrorProgressText" />
 
     <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)">
       <?ifdef OfficialBuild ?>
         <ComponentRef Id="omaha_registration"/>
       <?endif?>
-      <ComponentRef Id="remoting_me2me_host"/>
-      <ComponentRef Id="remoting_service"/>
-      <ComponentRef Id="sas.dll"/>
-      <ComponentRef Id="service_controller"/>
+      <ComponentRef Id="remoting_controller"/>
+      <ComponentRef Id="remoting_daemon"/>
+      <?ifdef RemotingMultiProcess ?>
+        <ComponentRef Id="remoting_desktop"/>
+      <?endif?>
+      <ComponentRef Id="remoting_host"/>
+      <ComponentRef Id="sas"/>
     </Feature>
 
     <!-- Set the icon shown in Add/Remove Programs. -->
     <Icon Id="chromoting.ico" SourceFile="$(var.IconPath)"/>
     <Property Id="ARPPRODUCTICON" Value="chromoting.ico" />
 
     <InstallExecuteSequence>
       <Custom Action="query_auto_start_service" Before="InstallInitialize"/>
       <Custom Action="set_auto_start_service" After="StartServices">
         <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]>
@@ skipping 12 matching lines @@
       <Custom Action="set_service_description" Before="InstallInitialize">
         <![CDATA[VersionNT >= 600]]>
       </Custom>
 
       <!-- Schedule RemoveExistingProducts before installing any files.
            See http://msdn.microsoft.com/en-us/library/aa371197.aspx. -->
       <RemoveExistingProducts After="InstallInitialize" />
     </InstallExecuteSequence>
   </Product>
 </Wix>