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

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

Issue 9953002: The me2me host is now configurable from the web UI on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed one or two nits. :-) Created 8 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « remoting/host/host_service_win.cc ('k') | remoting/host/plugin/daemon_controller.h » ('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 <?ifdef OfficialBuild ?> 7 <?ifdef OfficialBuild ?>
8 <?define ChromotingHost = "Chrome Remote Desktop Host" ?> 8 <?define ChromotingHost = "Chrome Remote Desktop Host" ?>
9 <?define FirewallName = "Chrome Remote Desktop Host" ?> 9 <?define FirewallName = "Chrome Remote Desktop Host" ?>
10 <?define Manufacturer = "Google Inc." ?> 10 <?define Manufacturer = "Google Inc." ?>
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 Name="$(var.ServiceName)" 92 Name="$(var.ServiceName)"
93 DisplayName="@[chromoting]remoting_service.exe,-101" 93 DisplayName="@[chromoting]remoting_service.exe,-101"
94 Description="@[chromoting]remoting_service.exe,-102" 94 Description="@[chromoting]remoting_service.exe,-102"
95 Arguments="--host-binary=&quot;[chromoting]remoting_me2m e_host.exe&quot;" 95 Arguments="--host-binary=&quot;[chromoting]remoting_me2m e_host.exe&quot;"
96 Start="auto" 96 Start="auto"
97 Account="LocalSystem" 97 Account="LocalSystem"
98 ErrorControl="ignore" 98 ErrorControl="ignore"
99 Interactive="no" /> 99 Interactive="no" />
100 100
101 <ServiceControl Id="start_service" 101 <ServiceControl Id="start_service"
102 Start="install"
103 Stop="both" 102 Stop="both"
104 Remove="uninstall" 103 Remove="uninstall"
105 Name="$(var.ServiceName)" 104 Name="$(var.ServiceName)"
106 Wait="yes" /> 105 Wait="yes" />
107 </Component> 106 </Component>
108 107
109 <Component Id="remoting_me2me_host.exe" 108 <Component Id="remoting_me2me_host.exe"
110 Guid="0e1889af-f3f8-45a2-b2d0-c719d53c4474"> 109 Guid="0e1889af-f3f8-45a2-b2d0-c719d53c4474">
111 <File Id="remoting_me2me_host.exe" 110 <File Id="remoting_me2me_host.exe"
112 DiskId="1" 111 DiskId="1"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 <RegistryKey Key="ProxyStubClsid32" Action="create"> 239 <RegistryKey Key="ProxyStubClsid32" Action="create">
241 <RegistryValue Type="string" 240 <RegistryValue Type="string"
242 Value="{00020424-0000-0000-C000-000000000046}"/> 241 Value="{00020424-0000-0000-C000-000000000046}"/>
243 </RegistryKey> 242 </RegistryKey>
244 243
245 <RegistryKey Key="TypeLib" Action="create"> 244 <RegistryKey Key="TypeLib" Action="create">
246 <RegistryValue Type="string" 245 <RegistryValue Type="string"
247 Value="$(var.ControllerTypelib)"/> 246 Value="$(var.ControllerTypelib)"/>
248 </RegistryKey> 247 </RegistryKey>
249 </RegistryKey> 248 </RegistryKey>
250
251 <RegistryKey Key="{3ca3adb6-2dea-4c74-b267-610fef11e4ff}"
252 Action="create">
253 <RegistryKey Key="ProxyStubClsid32" Action="create">
254 <RegistryValue Type="string"
255 Value="{00020424-0000-0000-C000-000000000046}"/>
256 </RegistryKey>
257
258 <RegistryKey Key="TypeLib" Action="create">
259 <RegistryValue Type="string"
260 Value="$(var.ControllerTypelib)"/>
261 </RegistryKey>
262 </RegistryKey>
263 </RegistryKey> 249 </RegistryKey>
264 250
265 <RegistryKey Key="Typelib"> 251 <RegistryKey Key="Typelib">
266 <RegistryKey Key="$(var.ControllerTypelib)" Action="create"> 252 <RegistryKey Key="$(var.ControllerTypelib)" Action="create">
267 <RegistryKey Key="1.0" Action="create"> 253 <RegistryKey Key="1.0" Action="create">
268 <RegistryKey Key="0" Action="create"> 254 <RegistryKey Key="0" Action="create">
269 <RegistryKey Key="win32" Action="create"> 255 <RegistryKey Key="win32" Action="create">
270 <RegistryValue Type="string" 256 <RegistryValue Type="string"
271 Value="[#$(var.ControllerBinary)]"/> 257 Value="[#$(var.ControllerBinary)]"/>
272 </RegistryKey> 258 </RegistryKey>
(...skipping 21 matching lines...) Expand all
294 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)"> 280 <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)">
295 <ComponentRef Id="omaha_registration"/> 281 <ComponentRef Id="omaha_registration"/>
296 <ComponentRef Id="remoting_service.exe"/> 282 <ComponentRef Id="remoting_service.exe"/>
297 <ComponentRef Id="remoting_me2me_host.exe"/> 283 <ComponentRef Id="remoting_me2me_host.exe"/>
298 <ComponentRef Id="sas.dll"/> 284 <ComponentRef Id="sas.dll"/>
299 <ComponentRef Id="service_controller"/> 285 <ComponentRef Id="service_controller"/>
300 </Feature> 286 </Feature>
301 287
302 </Product> 288 </Product>
303 </Wix> 289 </Wix>
OLDNEW
« no previous file with comments | « remoting/host/host_service_win.cc ('k') | remoting/host/plugin/daemon_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698