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 4b35e07134ae260885a3860a90647989dc1b7405..96c8227b000d659d424303b00a3de47c0a023558 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -579,6 +579,19 @@ GURL ChromeContentRendererClient::GetNaClContentHandlerURL( |
return GURL(); |
} |
+// TODO(dschuff): remove this when ARM ABI is stable |
+#if defined(__arm__) |
Ben Goodger (Google)
2012/10/15 21:54:11
&& OS CHROMEOS?
Robert Muth (chromium)
2012/10/15 21:56:06
we do not use it below either and it has to be sym
Ben Goodger (Google)
2012/10/15 22:19:14
Does this affect Clank etc too then?
robertm
2012/10/15 22:25:48
yes but clank does not have native client support
Ben Goodger (Google)
2012/10/15 23:01:35
ok so why not just make both places OS_CHROMEOS
robertm
2012/10/15 23:08:26
Done.
|
+static bool IsWhiteListedARM(const GURL& url) { |
+ return |
+ // QuickOffice |
+ url.host() == "gbkeegbaiigmenfmjfclcdgdpimamgkj" || |
+ // ssh dev |
+ url.host() == "okddffdblfhhnmhodogpojmfkjmhinfp" || |
+ // ssh stable |
+ url.host() == "pnhechapfaindjhompbnflcldabbghjo"; |
+} |
+#endif |
+ |
// static |
bool ChromeContentRendererClient::IsNaClAllowed( |
const GURL& manifest_url, |
@@ -602,12 +615,12 @@ bool ChromeContentRendererClient::IsNaClAllowed( |
#if defined(__arm__) |
// The ARM ABI is not quite stable, so only allow NaCl for |
// unrestricted extensions (i.e. built-in and under development), |
- // and for the QuickOffice webstore app. |
+ // and for certain whitelisted webstore apps. |
// See http://crbug.com/145694 |
// TODO(dschuff): remove this when the ABI is stable |
(is_extension_from_webstore && |
manifest_url.SchemeIs("chrome-extension") && |
- manifest_url.host() == "gbkeegbaiigmenfmjfclcdgdpimamgkj") || |
+ IsWhiteListedARM(manifest_url) || |
#else |
is_extension_from_webstore || |
is_whitelisted_url || |