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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 10898034: Disallow NaCl in chrome webstore for ARM (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 168a585aa14394aa6a8224d3795d4567f92bebda..e4e47f2967ef3cd062f93f1b662e6e95e16d5b0b 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -605,11 +605,17 @@ bool ChromeContentRendererClient::IsNaClAllowed(
// Allow Chrome Web Store extensions, built-in extensions, extensions
// under development, invocations from whitelisted URLs, and all invocations
// if --enable-nacl is set.
+#ifdef __arm__
jvoung (off chromium) 2012/08/29 16:49:33 nit: not sure if the if-defs are usually ARCH_CPU_
Derek Schuff 2012/08/29 17:00:25 Yeah, I wasn't sure either. I found both sprinkled
+ // Since the ARM ABI is not quite stable, do not allow webstore extensions
+ // to use it yet. TODO(dschuff): remove this when the ABI is stable
+ bool is_nacl_allowed = is_extension_unrestricted || is_nacl_unrestricted;
jvoung (off chromium) 2012/08/29 16:49:33 Just to confirm, some of the apps we are intereste
Derek Schuff 2012/08/29 17:00:25 Right. If you look directly above the only whiteli
+#else
bool is_nacl_allowed =
is_extension_from_webstore ||
is_extension_unrestricted ||
is_whitelisted_url ||
is_nacl_unrestricted;
+#endif
if (is_nacl_allowed) {
bool app_can_use_dev_interfaces =
// NaCl PDF viewer extension
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698