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

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..a14a849b155c62895f7b7465e3fc77693d4a7dd5 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -606,10 +606,15 @@ bool ChromeContentRendererClient::IsNaClAllowed(
// under development, invocations from whitelisted URLs, and all invocations
// if --enable-nacl is set.
bool is_nacl_allowed =
- is_extension_from_webstore ||
- is_extension_unrestricted ||
- is_whitelisted_url ||
- is_nacl_unrestricted;
+#if !defined(__arm__)
+ // The ARM ABI is not quite stable, so only allow NaCl for
+ // unrestricted extensions (i.e. built-in and under development).
+ // TODO(dschuff): remove this when the ABI is stable
+ is_extension_from_webstore ||
+ is_whitelisted_url ||
+#endif
+ is_extension_unrestricted ||
+ is_nacl_unrestricted;
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