Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2984)

Unified Diff: chrome/common/pepper_flash.cc

Issue 1030803002: Restore the architecture check for Pepper plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/test/data/components/flapper/windows_x64/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/pepper_flash.cc
diff --git a/chrome/common/pepper_flash.cc b/chrome/common/pepper_flash.cc
index b21d4d12197cf33c99431bba711cf2c3aac51abc..da1c00de65519dee1f77c0f9d5d7011c836b91ac 100644
--- a/chrome/common/pepper_flash.cc
+++ b/chrome/common/pepper_flash.cc
@@ -117,14 +117,10 @@ bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
if (os != kPepperFlashOperatingSystem)
return false;
-// On Win64, PepperFlash manifests have "ia32" instead of "x64" so skip the
-// architecture check. TODO(wfh): remove this when crbug.com/458894 is fixed.
-#if !defined(OS_WIN) || !defined(ARCH_CPU_X86_64)
std::string arch;
manifest.GetStringASCII("x-ppapi-arch", &arch);
if (arch != kPepperFlashArch)
return false;
-#endif
*version_out = version;
return true;
« no previous file with comments | « no previous file | chrome/test/data/components/flapper/windows_x64/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698