|
|
Created:
7 years, 6 months ago by zhchbin Modified:
7 years, 6 months ago Reviewers:
jochen (gone - plz use gerrit) CC:
chromium-reviews, joi+watch-content_chromium.org, darin-cc_chromium.org, jam, jochen+watch_chromium.org Base URL:
https://chromium.googlesource.com/chromium/src.git@master Visibility:
Public. |
DescriptionEnable visual styles for content_shell.exe, so that tooltips can work when hover around an element with title attribution.
BUG=239437
TEST=Run content_shell.exe and go to http://xkcd.com, hover around the image in the middle should show the tooltips.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203914
Patch Set 1 #Patch Set 2 : rebase #Patch Set 3 : Rebase #Patch Set 4 : Do not find copies. #
Messages
Total messages: 15 (0 generated)
@johen, Please review.
lgtm
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/zhchbin@gmail.com/15649020/1
Failed to apply patch for content/shell/app/shell.exe.manifest: While running patch -p1 --forward --force --no-backup-if-mismatch; A content/shell/app/shell.exe.manifest Copied chrome/app/chrome.exe.manifest -> content/shell/app/shell.exe.manifest patching file content/shell/app/shell.exe.manifest Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file content/shell/app/shell.exe.manifest.rej Patch: NR chrome/app/chrome.exe.manifest->content/shell/app/shell.exe.manifest Index: content/shell/app/shell.exe.manifest diff --git a/chrome/app/chrome.exe.manifest b/content/shell/app/shell.exe.manifest similarity index 96% copy from chrome/app/chrome.exe.manifest copy to content/shell/app/shell.exe.manifest index ba2f19180e38155b7f9384a6c2c0e5a7189e70e0..d5efbcebb07bafd4f0b3b261121c8a5e50a18110 100644 --- a/chrome/app/chrome.exe.manifest +++ b/content/shell/app/shell.exe.manifest @@ -1,29 +1,29 @@ -<?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> - - <dependency> - <dependentAssembly> - <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity> - </dependentAssembly> - </dependency> - - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> - <security> - <requestedPrivileges> - <requestedExecutionLevel level="asInvoker" /> - </requestedPrivileges> - </security> - </trustInfo> - -</assembly> +<?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> + + <dependency> + <dependentAssembly> + <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity> + </dependentAssembly> + </dependency> + + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" /> + </requestedPrivileges> + </security> + </trustInfo> + +</assembly>
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/zhchbin@gmail.com/15649020/6001
Failed to apply patch for content/shell/app/shell.exe.manifest: While running patch -p1 --forward --force --no-backup-if-mismatch; A content/shell/app/shell.exe.manifest Copied chrome/app/chrome.exe.manifest -> content/shell/app/shell.exe.manifest patching file content/shell/app/shell.exe.manifest Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file content/shell/app/shell.exe.manifest.rej Patch: NR chrome/app/chrome.exe.manifest->content/shell/app/shell.exe.manifest Index: content/shell/app/shell.exe.manifest diff --git a/chrome/app/chrome.exe.manifest b/content/shell/app/shell.exe.manifest similarity index 96% copy from chrome/app/chrome.exe.manifest copy to content/shell/app/shell.exe.manifest index ba2f19180e38155b7f9384a6c2c0e5a7189e70e0..d5efbcebb07bafd4f0b3b261121c8a5e50a18110 100644 --- a/chrome/app/chrome.exe.manifest +++ b/content/shell/app/shell.exe.manifest @@ -1,29 +1,29 @@ -<?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> - - <dependency> - <dependentAssembly> - <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity> - </dependentAssembly> - </dependency> - - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> - <security> - <requestedPrivileges> - <requestedExecutionLevel level="asInvoker" /> - </requestedPrivileges> - </security> - </trustInfo> - -</assembly> +<?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> + + <dependency> + <dependentAssembly> + <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity> + </dependentAssembly> + </dependency> + + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" /> + </requestedPrivileges> + </security> + </trustInfo> + +</assembly>
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/zhchbin@gmail.com/15649020/11001
Failed to apply patch for content/shell/app/shell.exe.manifest: While running patch -p1 --forward --force --no-backup-if-mismatch; A content/shell/app/shell.exe.manifest Copied chrome/app/chrome.exe.manifest -> content/shell/app/shell.exe.manifest patching file content/shell/app/shell.exe.manifest Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file content/shell/app/shell.exe.manifest.rej Patch: NR chrome/app/chrome.exe.manifest->content/shell/app/shell.exe.manifest Index: content/shell/app/shell.exe.manifest diff --git a/chrome/app/chrome.exe.manifest b/content/shell/app/shell.exe.manifest similarity index 96% copy from chrome/app/chrome.exe.manifest copy to content/shell/app/shell.exe.manifest index ba2f19180e38155b7f9384a6c2c0e5a7189e70e0..d5efbcebb07bafd4f0b3b261121c8a5e50a18110 100644 --- a/chrome/app/chrome.exe.manifest +++ b/content/shell/app/shell.exe.manifest @@ -1,29 +1,29 @@ -<?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> - - <dependency> - <dependentAssembly> - <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity> - </dependentAssembly> - </dependency> - - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> - <security> - <requestedPrivileges> - <requestedExecutionLevel level="asInvoker" /> - </requestedPrivileges> - </security> - </trustInfo> - -</assembly> +<?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> + + <dependency> + <dependentAssembly> + <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity> + </dependentAssembly> + </dependency> + + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" /> + </requestedPrivileges> + </security> + </trustInfo> + +</assembly>
On 2013/06/03 14:37:29, I haz the power (commit-bot) wrote: > Failed to apply patch for content/shell/app/shell.exe.manifest: > While running patch -p1 --forward --force --no-backup-if-mismatch; > A content/shell/app/shell.exe.manifest > Copied chrome/app/chrome.exe.manifest -> content/shell/app/shell.exe.manifest > patching file content/shell/app/shell.exe.manifest > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file > content/shell/app/shell.exe.manifest.rej > > Patch: NR > chrome/app/chrome.exe.manifest->content/shell/app/shell.exe.manifest > Index: content/shell/app/shell.exe.manifest > diff --git a/chrome/app/chrome.exe.manifest > b/content/shell/app/shell.exe.manifest > similarity index 96% > copy from chrome/app/chrome.exe.manifest > copy to content/shell/app/shell.exe.manifest > index > ba2f19180e38155b7f9384a6c2c0e5a7189e70e0..d5efbcebb07bafd4f0b3b261121c8a5e50a18110 > 100644 > --- a/chrome/app/chrome.exe.manifest > +++ b/content/shell/app/shell.exe.manifest > @@ -1,29 +1,29 @@ > -<?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> > - > - <dependency> > - <dependentAssembly> > - <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" > version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" > language="*"></assemblyIdentity> > - </dependentAssembly> > - </dependency> > - > - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> > - <security> > - <requestedPrivileges> > - <requestedExecutionLevel level="asInvoker" /> > - </requestedPrivileges> > - </security> > - </trustInfo> > - > -</assembly> > +<?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> > + > + <dependency> > + <dependentAssembly> > + <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" > version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" > language="*"></assemblyIdentity> > + </dependentAssembly> > + </dependency> > + > + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> > + <security> > + <requestedPrivileges> > + <requestedExecutionLevel level="asInvoker" /> > + </requestedPrivileges> > + </security> > + </trustInfo> > + > +</assembly> @johen, thought I rebase twice, I couldn't commit it successfully. Is it caused by this: http://www.chromium.org/developers/testing/commit-queue#TOC-Is-the-CQ-broken- ? Or I make some mistakes?
On 2013/06/03 15:53:08, zhchbin wrote: > On 2013/06/03 14:37:29, I haz the power (commit-bot) wrote: > > Failed to apply patch for content/shell/app/shell.exe.manifest: > > While running patch -p1 --forward --force --no-backup-if-mismatch; > > A content/shell/app/shell.exe.manifest > > Copied chrome/app/chrome.exe.manifest -> > content/shell/app/shell.exe.manifest > > patching file content/shell/app/shell.exe.manifest > > Hunk #1 FAILED at 1. > > 1 out of 1 hunk FAILED -- saving rejects to file > > content/shell/app/shell.exe.manifest.rej > > > > Patch: NR > > chrome/app/chrome.exe.manifest->content/shell/app/shell.exe.manifest > > Index: content/shell/app/shell.exe.manifest > > diff --git a/chrome/app/chrome.exe.manifest > > b/content/shell/app/shell.exe.manifest > > similarity index 96% > > copy from chrome/app/chrome.exe.manifest > > copy to content/shell/app/shell.exe.manifest > > index > > > ba2f19180e38155b7f9384a6c2c0e5a7189e70e0..d5efbcebb07bafd4f0b3b261121c8a5e50a18110 > > 100644 > > --- a/chrome/app/chrome.exe.manifest > > +++ b/content/shell/app/shell.exe.manifest > > @@ -1,29 +1,29 @@ > > -<?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> > > - > > - <dependency> > > - <dependentAssembly> > > - <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" > > version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" > > language="*"></assemblyIdentity> > > - </dependentAssembly> > > - </dependency> > > - > > - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> > > - <security> > > - <requestedPrivileges> > > - <requestedExecutionLevel level="asInvoker" /> > > - </requestedPrivileges> > > - </security> > > - </trustInfo> > > - > > -</assembly> > > +<?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> > > + > > + <dependency> > > + <dependentAssembly> > > + <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" > > version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" > > language="*"></assemblyIdentity> > > + </dependentAssembly> > > + </dependency> > > + > > + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> > > + <security> > > + <requestedPrivileges> > > + <requestedExecutionLevel level="asInvoker" /> > > + </requestedPrivileges> > > + </security> > > + </trustInfo> > > + > > +</assembly> > > @johen, thought I rebase twice, I couldn't commit it successfully. Is it caused > by this: > http://www.chromium.org/developers/testing/commit-queue#TOC-Is-the-CQ-broken- ? > Or I make some mistakes? It looks like chrome/app/chrome.exe.manifest has CR LF line endings, which often cause problems (see also http://crbug.com/128744). I think you can try uploading the patch again with --no-find-copies so that shell.exe.manifest is not considered as copied and patched from chrome.exe.manifest.
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/zhchbin@gmail.com/15649020/15001
On 2013/06/04 01:39:36, 方觉(Fang Jue) wrote: > On 2013/06/03 15:53:08, zhchbin wrote: > > On 2013/06/03 14:37:29, I haz the power (commit-bot) wrote: > > > Failed to apply patch for content/shell/app/shell.exe.manifest: > > > While running patch -p1 --forward --force --no-backup-if-mismatch; > > > A content/shell/app/shell.exe.manifest > > > Copied chrome/app/chrome.exe.manifest -> > > content/shell/app/shell.exe.manifest > > > patching file content/shell/app/shell.exe.manifest > > > Hunk #1 FAILED at 1. > > > 1 out of 1 hunk FAILED -- saving rejects to file > > > content/shell/app/shell.exe.manifest.rej > > > > > > Patch: NR > > > chrome/app/chrome.exe.manifest->content/shell/app/shell.exe.manifest > > > Index: content/shell/app/shell.exe.manifest > > > diff --git a/chrome/app/chrome.exe.manifest > > > b/content/shell/app/shell.exe.manifest > > > similarity index 96% > > > copy from chrome/app/chrome.exe.manifest > > > copy to content/shell/app/shell.exe.manifest > > > index > > > > > > ba2f19180e38155b7f9384a6c2c0e5a7189e70e0..d5efbcebb07bafd4f0b3b261121c8a5e50a18110 > > > 100644 > > > --- a/chrome/app/chrome.exe.manifest > > > +++ b/content/shell/app/shell.exe.manifest > > > @@ -1,29 +1,29 @@ > > > -<?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> > > > - > > > - <dependency> > > > - <dependentAssembly> > > > - <assemblyIdentity type="Win32" > name="Microsoft.Windows.Common-Controls" > > > version="6.0.0.0" processorArchitecture="*" > publicKeyToken="6595b64144ccf1df" > > > language="*"></assemblyIdentity> > > > - </dependentAssembly> > > > - </dependency> > > > - > > > - <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> > > > - <security> > > > - <requestedPrivileges> > > > - <requestedExecutionLevel level="asInvoker" /> > > > - </requestedPrivileges> > > > - </security> > > > - </trustInfo> > > > - > > > -</assembly> > > > +<?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> > > > + > > > + <dependency> > > > + <dependentAssembly> > > > + <assemblyIdentity type="Win32" > name="Microsoft.Windows.Common-Controls" > > > version="6.0.0.0" processorArchitecture="*" > publicKeyToken="6595b64144ccf1df" > > > language="*"></assemblyIdentity> > > > + </dependentAssembly> > > > + </dependency> > > > + > > > + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> > > > + <security> > > > + <requestedPrivileges> > > > + <requestedExecutionLevel level="asInvoker" /> > > > + </requestedPrivileges> > > > + </security> > > > + </trustInfo> > > > + > > > +</assembly> > > > > @johen, thought I rebase twice, I couldn't commit it successfully. Is it > caused > > by this: > > http://www.chromium.org/developers/testing/commit-queue#TOC-Is-the-CQ-broken- > ? > > Or I make some mistakes? > > It looks like chrome/app/chrome.exe.manifest has CR LF line endings, which often > cause problems (see also http://crbug.com/128744). I think you can try uploading > the patch again with --no-find-copies so that shell.exe.manifest is not > considered as copied and patched from chrome.exe.manifest. Wow, thanks for the heads up very much.
Sorry for I got bad news for ya. Compile failed with a clobber build on linux_rel. http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&... Your code is likely broken or HEAD is junk. Please ensure your code is not broken then alert the build sheriffs. Look at the try server FAQ for more details.
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/zhchbin@gmail.com/15649020/15001
Message was sent while issue was closed.
Change committed as 203914 |