diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 21:51:15 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 21:51:15 +0000 |
| commit | 1cb9d02437992810a6c887bec8bc7861e2e67d05 (patch) | |
| tree | 12e5a430da73e07596062cfcde4707b37fdbb09e /chrome/app | |
| parent | 778cb2f49af834951ab17e95c9143c313e5bf1a2 (diff) | |
| download | chromium_src-1cb9d02437992810a6c887bec8bc7861e2e67d05.zip chromium_src-1cb9d02437992810a6c887bec8bc7861e2e67d05.tar.gz chromium_src-1cb9d02437992810a6c887bec8bc7861e2e67d05.tar.bz2 | |
Add a manifest to chrome.exe because we need that
to pass the OEM Ready tests.
bug:1496104
Review URL: http://codereview.chromium.org/11330
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome.exe.manifest | 15 | ||||
| -rw-r--r-- | chrome/app/chrome_exe.vcproj | 2 | ||||
| -rw-r--r-- | chrome/app/chrome_exe.vsprops | 1 |
3 files changed, 17 insertions, 1 deletions
diff --git a/chrome/app/chrome.exe.manifest b/chrome/app/chrome.exe.manifest new file mode 100644 index 0000000..d4ceb7a --- /dev/null +++ b/chrome/app/chrome.exe.manifest @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+ </dependentAssembly>
+ </dependency>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker" />
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+</assembly>
\ No newline at end of file diff --git a/chrome/app/chrome_exe.vcproj b/chrome/app/chrome_exe.vcproj index b9e8761..84af740 100644 --- a/chrome/app/chrome_exe.vcproj +++ b/chrome/app/chrome_exe.vcproj @@ -62,6 +62,7 @@ /> <Tool Name="VCManifestTool" + AdditionalManifestFiles="$(SolutionDir)\app\chrome.exe.manifest" /> <Tool Name="VCXDCMakeTool" @@ -128,6 +129,7 @@ /> <Tool Name="VCManifestTool" + AdditionalManifestFiles="$(SolutionDir)\app\chrome.exe.manifest" /> <Tool Name="VCXDCMakeTool" diff --git a/chrome/app/chrome_exe.vsprops b/chrome/app/chrome_exe.vsprops index f90313c..a9eaa0b 100644 --- a/chrome/app/chrome_exe.vsprops +++ b/chrome/app/chrome_exe.vsprops @@ -12,7 +12,6 @@ <Tool Name="VCLinkerTool" OutputFile="$(OutDir)\chrome.exe" - AdditionalManifestDependencies=""type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df' language='*'"" ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" /> <Tool |