diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-20 16:17:20 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-20 16:17:20 +0000 |
| commit | 9a5e772bf100050f9d132d1e7a7425633043bac2 (patch) | |
| tree | 64a60454c0605506340ee45c113b8e51a65e1041 | |
| parent | 92d728a8054f5728b16bda78ae81e089d08045c8 (diff) | |
| download | chromium_src-9a5e772bf100050f9d132d1e7a7425633043bac2.zip chromium_src-9a5e772bf100050f9d132d1e7a7425633043bac2.tar.gz chromium_src-9a5e772bf100050f9d132d1e7a7425633043bac2.tar.bz2 | |
Update mini_installer and setup manifest for Windows 7 to silence PCA.
Apparently in Windows 7 we need to define supportedOS to make Program
Compatibility Assistant happy (
http://msdn.microsoft.com/en-us/library/dd371711(VS.85).aspx).
BUG=9431
TEST=Install/uninstall Chromium on windows 7 without elevation and UAC enabled and make sure PAC dialog doesn't show up.
Review URL: http://codereview.chromium.org/159045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21075 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.exe.manifest | 24 | ||||
| -rw-r--r-- | chrome/installer/setup/setup.exe.manifest | 24 |
2 files changed, 32 insertions, 16 deletions
diff --git a/chrome/installer/mini_installer/mini_installer.exe.manifest b/chrome/installer/mini_installer/mini_installer.exe.manifest index 28469a3..8deae31 100644 --- a/chrome/installer/mini_installer/mini_installer.exe.manifest +++ b/chrome/installer/mini_installer/mini_installer.exe.manifest @@ -1,11 +1,19 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2">
- <ms_asmv2:security>
- <ms_asmv2:requestedPrivileges>
- <ms_asmv2:requestedExecutionLevel level="asInvoker">
- </ms_asmv2:requestedExecutionLevel>
- </ms_asmv2:requestedPrivileges>
- </ms_asmv2:security>
- </ms_asmv2:trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ </application>
+ </compatibility>
+ <ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2">
+ <ms_asmv2:security>
+ <ms_asmv2:requestedPrivileges>
+ <ms_asmv2:requestedExecutionLevel level="asInvoker">
+ </ms_asmv2:requestedExecutionLevel>
+ </ms_asmv2:requestedPrivileges>
+ </ms_asmv2:security>
+ </ms_asmv2:trustInfo>
</assembly>
diff --git a/chrome/installer/setup/setup.exe.manifest b/chrome/installer/setup/setup.exe.manifest index 28469a3..8deae31 100644 --- a/chrome/installer/setup/setup.exe.manifest +++ b/chrome/installer/setup/setup.exe.manifest @@ -1,11 +1,19 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2">
- <ms_asmv2:security>
- <ms_asmv2:requestedPrivileges>
- <ms_asmv2:requestedExecutionLevel level="asInvoker">
- </ms_asmv2:requestedExecutionLevel>
- </ms_asmv2:requestedPrivileges>
- </ms_asmv2:security>
- </ms_asmv2:trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ </application>
+ </compatibility>
+ <ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2">
+ <ms_asmv2:security>
+ <ms_asmv2:requestedPrivileges>
+ <ms_asmv2:requestedExecutionLevel level="asInvoker">
+ </ms_asmv2:requestedExecutionLevel>
+ </ms_asmv2:requestedPrivileges>
+ </ms_asmv2:security>
+ </ms_asmv2:trustInfo>
</assembly>
|