Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(629)

Side by Side Diff: remoting/host/installer/win/chromoting.wxs

Issue 2033683003: Removing Chromoting's dependence on the sas.dll (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updating comment Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/host/BUILD.gn ('k') | remoting/host/sas_injector_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0"?> 1 <?xml version="1.0"?>
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> 2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3 3
4 <?define EventSourceName = "chromoting" ?> 4 <?define EventSourceName = "chromoting" ?>
5 <?define ServiceName = "chromoting" ?> 5 <?define ServiceName = "chromoting" ?>
6 6
7 <!-- TODO(alexeypa): There strings should be localized, 7 <!-- TODO(alexeypa): There strings should be localized,
8 see http://crbug.com/121785 --> 8 see http://crbug.com/121785 -->
9 <?if $(var.Branding) ~= Chrome ?> 9 <?if $(var.Branding) ~= Chrome ?>
10 <?define ChromotingHost = "Chrome Remote Desktop Host" ?> 10 <?define ChromotingHost = "Chrome Remote Desktop Host" ?>
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 <Directory Id="common_app_data_google" Name="Google"> 146 <Directory Id="common_app_data_google" Name="Google">
147 <Directory Id="config_files" Name="Chrome Remote Desktop"/> 147 <Directory Id="config_files" Name="Chrome Remote Desktop"/>
148 </Directory> 148 </Directory>
149 <?else?> 149 <?else?>
150 <Directory Id="config_files" Name="Chromoting"/> 150 <Directory Id="config_files" Name="Chromoting"/>
151 <?endif?> 151 <?endif?>
152 </Directory> 152 </Directory>
153 </Directory> 153 </Directory>
154 154
155 <DirectoryRef Id="binaries"> 155 <DirectoryRef Id="binaries">
156 <Component Id="sas" Guid="*">
157 <File Id="sas.dll"
158 DiskId="1"
159 Name="sas.dll"
160 Vital="yes"/>
161 </Component>
162
163 <Component Id="credits" Guid="*"> 156 <Component Id="credits" Guid="*">
164 <File Id="CREDITS.txt" 157 <File Id="CREDITS.txt"
165 DiskId="1" 158 DiskId="1"
166 Name="CREDITS.txt" 159 Name="CREDITS.txt"
167 Vital="yes"/> 160 Vital="yes"/>
168 </Component> 161 </Component>
169 162
170 <Component Id="remoting_core" Guid="*"> 163 <Component Id="remoting_core" Guid="*">
171 <File Id="$(var.CoreBinary)" 164 <File Id="$(var.CoreBinary)"
172 DiskId="1" 165 DiskId="1"
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 <ComponentRef Id="remote_assistance_host_registry"/> 622 <ComponentRef Id="remote_assistance_host_registry"/>
630 <ComponentRef Id="remote_security_key"/> 623 <ComponentRef Id="remote_security_key"/>
631 <ComponentRef Id="remote_security_key_registration"/> 624 <ComponentRef Id="remote_security_key_registration"/>
632 <ComponentRef Id="remoting_native_messaging_host"/> 625 <ComponentRef Id="remoting_native_messaging_host"/>
633 <ComponentRef Id="remoting_core"/> 626 <ComponentRef Id="remoting_core"/>
634 <ComponentRef Id="remoting_desktop"/> 627 <ComponentRef Id="remoting_desktop"/>
635 <ComponentRef Id="remoting_host"/> 628 <ComponentRef Id="remoting_host"/>
636 <ComponentRef Id="remoting_lib"/> 629 <ComponentRef Id="remoting_lib"/>
637 <ComponentRef Id="remoting_pairing_registry"/> 630 <ComponentRef Id="remoting_pairing_registry"/>
638 <ComponentRef Id="remoting_start_host"/> 631 <ComponentRef Id="remoting_start_host"/>
639 <ComponentRef Id="sas"/>
640 <ComponentRef Id="sawbuck_provider"/> 632 <ComponentRef Id="sawbuck_provider"/>
641 </Feature> 633 </Feature>
642 634
643 <!-- Set the icon shown in Add/Remove Programs. --> 635 <!-- Set the icon shown in Add/Remove Programs. -->
644 <Icon Id="chromoting.ico" SourceFile="chromoting.ico"/> 636 <Icon Id="chromoting.ico" SourceFile="chromoting.ico"/>
645 <Property Id="ARPPRODUCTICON" Value="chromoting.ico" /> 637 <Property Id="ARPPRODUCTICON" Value="chromoting.ico" />
646 638
647 <InstallExecuteSequence> 639 <InstallExecuteSequence>
648 <Custom Action="query_auto_start_service" Before="InstallInitialize"/> 640 <Custom Action="query_auto_start_service" Before="InstallInitialize"/>
649 <Custom Action="start_chromoting_service" After="StartServices"> 641 <Custom Action="start_chromoting_service" After="StartServices">
650 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]> 642 <![CDATA[NOT REMOVE AND (auto_start_service = "#2")]]>
651 </Custom> 643 </Custom>
652 644
653 <!-- Set the service name and description --> 645 <!-- Set the service name and description -->
654 <Custom Action="set_service_display_name" Before="InstallInitialize"/> 646 <Custom Action="set_service_display_name" Before="InstallInitialize"/>
655 <Custom Action="set_service_description" Before="InstallInitialize"/> 647 <Custom Action="set_service_description" Before="InstallInitialize"/>
656 648
657 <!-- Schedule RemoveExistingProducts before installing any files. 649 <!-- Schedule RemoveExistingProducts before installing any files.
658 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. --> 650 See http://msdn.microsoft.com/en-us/library/aa371197.aspx. -->
659 <RemoveExistingProducts After="InstallInitialize" /> 651 <RemoveExistingProducts After="InstallInitialize" />
660 </InstallExecuteSequence> 652 </InstallExecuteSequence>
661 </Product> 653 </Product>
662 </Wix> 654 </Wix>
OLDNEW
« no previous file with comments | « remoting/host/BUILD.gn ('k') | remoting/host/sas_injector_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698