Revert 153268 - Refactor manifests to allow all executables to use the same base manifests as AdditionalManifestFiles

Introduce additional.manifest with app compatibility guids and UAC asInvoker property (this is the same as the old chrome.exe.manifest, but without the non-common parts, see chrome.manifest below).

Introduce chrome.manifest to keep a property that was set in the previous chrome.(exe|dll).manifest to declare usage of ComCtl32.dll version 6 as is required per http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175(v=vs.85).aspx to get visual styles.

BUG=127765 (not really fixing it, but a follow up to the CL for it)
TEST=Manifests embedded in chrome.exe, chrome.dll, setup.exe, mini_installer.exe in a VS2010 static build are the exact same as before.

Review URL: https://chromiumcodereview.appspot.com/10879020

TBR=gab@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10880059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153389 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 57 insertions, 28 deletions

diff --git a/chrome/app/additional.manifest b/chrome/app/chrome.exe.manifest
index 2572696..be2515b 100644
--- a/chrome/app/additional.manifest
+++ b/chrome/app/chrome.exe.manifest
@@ -12,6 +12,12 @@
     </application>

   </compatibility>

   

+  <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>

diff --git a/chrome/app/chrome.manifest b/chrome/app/chrome.manifest
deleted file mode 100644
index c2de753..0000000
--- a/chrome/app/chrome.manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>

-</assembly>

diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 3503d2a..139b982 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -69,7 +69,6 @@
                 '../webkit/support/webkit_support.gyp:webkit_resources',
               ],
               'sources': [
-                'app/chrome.manifest',
                 'app/chrome_command_ids.h',
                 'app/chrome_dll.rc',
                 'app/chrome_dll_resource.h',
@@ -159,7 +158,7 @@
                   ],
                 },
                 'VCManifestTool': {
-                  'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.manifest',
+                  'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.dll.manifest',
                 },
               },
             }],  # OS=="win"
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index ada39ba..9909ed4 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -24,8 +24,6 @@
         'app/chrome_exe_resource.h',
         'app/client_util.cc',
         'app/client_util.h',
-        'app/additional.manifest',
-        'app/chrome.manifest',
         'app/hard_error_handler_win.cc',
         'app/hard_error_handler_win.h',
         'app/metro_driver_win.cc',
@@ -487,7 +485,7 @@
               'SubSystem': '2',
             },
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest;$(ProjectDir)\\app\\chrome.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\app\\chrome.exe.manifest',
             },
           },
           'actions': [
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index ddcc8ad..b21fd76 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -86,7 +86,6 @@
             '..',
           ],
           'sources': [
-            'app/additional.manifest',
             'installer/setup/compat_checks_unittest.cc',
             'installer/setup/setup_constants.cc',
             'installer/util/channel_info_unittest.cc',
@@ -130,7 +129,7 @@
           ],
           'msvs_settings': {
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest',
             },
           },
         },
@@ -235,7 +234,6 @@
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
-            'app/additional.manifest',
             'installer/util/installation_validation_helper.cc',
             'installer/util/installation_validation_helper.h',
             'test/mini_installer_test/installer_path_provider.cc',
@@ -251,7 +249,7 @@
           ],
           'msvs_settings': {
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\installer\\mini_installer\\mini_installer.exe.manifest',
             },
           },
         },
@@ -281,7 +279,6 @@
             ],
           },
           'sources': [
-            'app/additional.manifest',
             'installer/mini_installer/chrome.release',
             'installer/setup/chrome_frame_quick_enable.cc',
             'installer/setup/chrome_frame_quick_enable.h',
@@ -308,7 +305,7 @@
               'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
             },
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\app\\additional.manifest',
+              'AdditionalManifestFiles': '$(ProjectDir)\\installer\\setup\\setup.exe.manifest',
             },
           },
           'rules': [
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 5f8591d..73ca4f0 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -79,6 +79,11 @@
               }],
             ],
           },
+          'VCManifestTool': {
+            'AdditionalManifestFiles': [
+              '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
+            ],
+          },
         },
         'configurations': {
           'Debug_Base': {
@@ -180,17 +185,9 @@
           'msvs_precompiled_source': '',
 
           'sources': [
-            '../app/additional.manifest',
             'mini_installer/chrome.release',
             'mini_installer/chrome_appid.cc',
           ],
-          'msvs_settings': {
-            'VCManifestTool': {
-              'AdditionalManifestFiles': [
-                '$(ProjectDir)\\..\\app\\additional.manifest',
-              ],
-            },
-          },
           'rules': [
             {
               'rule_name': 'installer_archive',
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index af16272..ef92ab9 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -77,7 +77,7 @@
     },
     'VCManifestTool': {
       'AdditionalManifestFiles': [
-        '$(ProjectDir)\\..\\app\\additional.manifest',
+        '$(ProjectDir)\\mini_installer\\mini_installer.exe.manifest',
       ],
     },
   },
diff --git a/chrome/installer/mini_installer/mini_installer.exe.manifest b/chrome/installer/mini_installer/mini_installer.exe.manifest
new file mode 100644
index 0000000..49a2a76
--- /dev/null
+++ b/chrome/installer/mini_installer/mini_installer.exe.manifest
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

+  <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}"/>

+      <!--The ID below indicates application support for Windows 8 -->

+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>

+    </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:requestedPrivileges>

+    </ms_asmv2:security>

+  </ms_asmv2:trustInfo>

+</assembly>

diff --git a/chrome/installer/setup/setup.exe.manifest b/chrome/installer/setup/setup.exe.manifest
new file mode 100644
index 0000000..49a2a76
--- /dev/null
+++ b/chrome/installer/setup/setup.exe.manifest
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

+  <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}"/>

+      <!--The ID below indicates application support for Windows 8 -->

+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>

+    </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:requestedPrivileges>

+    </ms_asmv2:security>

+  </ms_asmv2:trustInfo>

+</assembly>