diff options
| author | weitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 06:39:00 +0000 |
|---|---|---|
| committer | weitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-17 06:39:00 +0000 |
| commit | f9caff4a25483d61fbf362ef47c0799fa7c1f722 (patch) | |
| tree | fe6dd2ef729b5ac80a814c89c337fdf64ecab449 /remoting/host | |
| parent | 0ef4179c93f4365bfa0f179d9cb69d3ad79c1035 (diff) | |
| download | chromium_src-f9caff4a25483d61fbf362ef47c0799fa7c1f722.zip chromium_src-f9caff4a25483d61fbf362ef47c0799fa7c1f722.tar.gz chromium_src-f9caff4a25483d61fbf362ef47c0799fa7c1f722.tar.bz2 | |
Using localized user account names in Windows chromoting host MSI.
TBR=jamiewalch@chromium.org
NOTRY=true
BUG=364315
Review URL: https://codereview.chromium.org/240693002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/installer/win/chromoting.wxs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/remoting/host/installer/win/chromoting.wxs b/remoting/host/installer/win/chromoting.wxs index d6b5557..2dfb8cc 100644 --- a/remoting/host/installer/win/chromoting.wxs +++ b/remoting/host/installer/win/chromoting.wxs @@ -92,6 +92,9 @@ Manufacturer="$(var.Manufacturer)" InstallScope="perMachine"/> + <PropertyRef Id="WIX_ACCOUNT_LOCALSYSTEM" /> + <PropertyRef Id="WIX_ACCOUNT_ADMINISTRATORS" /> + <Condition Message="$(var.ChromotingHost) is only supported on Windows XP, Windows Server 2003, or higher."> <![CDATA[Installed OR (VersionNT >= 501)]]> @@ -524,12 +527,11 @@ Windows Installer version 4.5 or lower. Also Cannot use PermissionEx in WixUtilExtension because it automatically inherits all the ACLs from the parent. --> - <Permission User="SYSTEM" + <Permission User="[WIX_ACCOUNT_LOCALSYSTEM]" GenericAll="yes" ChangePermission="yes" TakeOwnership="yes"/> - <Permission User="Administrators" - Domain="[LOCAL_MACHINE_NAME]" + <Permission User="[WIX_ACCOUNT_ADMINISTRATORS]" GenericAll="yes" ChangePermission="yes" TakeOwnership="yes"/> |