From c14cf06ffe16500cec6449b8165d3c6c26046b1e Mon Sep 17 00:00:00 2001
From: "alexeypa@chromium.org"
 <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 17 Jul 2013 05:59:47 +0000
Subject: Embed manifests using 'EmbedManifest' setting in GYP.

GYP supports 'EmbedManifest' and UAC settings for ninja since https://code.google.com/p/gyp/source/detail?r=1675. This CL starts using the GYP settings instead of the custom xxx_manifest targets.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211968 0039d316-1c4b-4281-b951-d872f2087c98
---
 remoting/host/win/comctl32_v6.manifest           |  8 --------
 remoting/host/win/require_administrator.manifest | 10 ----------
 2 files changed, 18 deletions(-)
 delete mode 100644 remoting/host/win/comctl32_v6.manifest
 delete mode 100644 remoting/host/win/require_administrator.manifest

(limited to 'remoting/host')

diff --git a/remoting/host/win/comctl32_v6.manifest b/remoting/host/win/comctl32_v6.manifest
deleted file mode 100644
index d351754..0000000
--- a/remoting/host/win/comctl32_v6.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="*" publicKeyToken="6595b64144ccf1df" language="*" />
-    </dependentAssembly>
-  </dependency>
-</assembly>
diff --git a/remoting/host/win/require_administrator.manifest b/remoting/host/win/require_administrator.manifest
deleted file mode 100644
index e132793..0000000
--- a/remoting/host/win/require_administrator.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="true" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
-- 
cgit v1.1