diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-30 18:15:24 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-30 18:15:24 +0000 |
| commit | 5cf0d02200ffb4ede98dafa81d397327453e3eef (patch) | |
| tree | 917d4b7f379b6d1b77c572b7de813a314206945c /chrome/renderer | |
| parent | c71ae5a754ac9a2a8ab3cbf200ab2e7a9dc0da17 (diff) | |
| download | chromium_src-5cf0d02200ffb4ede98dafa81d397327453e3eef.zip chromium_src-5cf0d02200ffb4ede98dafa81d397327453e3eef.tar.gz chromium_src-5cf0d02200ffb4ede98dafa81d397327453e3eef.tar.bz2 | |
Allows chrome://app-list/ to embed NaCl module.
It will use a NaCl module to recognize "Ok, Google" offline.
BUG=312365
R=bbudge@chromium.org, darin@chromium.org
TEST=manually
Review URL: https://codereview.chromium.org/45963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 912a374..8c366d3 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -819,9 +819,11 @@ bool ChromeContentRendererClient::IsNaClAllowed( bool is_nacl_unrestricted, const Extension* extension, WebPluginParams* params) { - // Temporarily allow these whitelisted apps to use NaCl. + // Temporarily allow these whitelisted apps and WebUIs to use NaCl. std::string app_url_host = app_url.host(); std::string manifest_url_path = manifest_url.path(); + bool is_whitelisted_web_ui = + app_url.spec() == chrome::kChromeUIAppListStartPageURL; bool is_whitelisted_app = // Whitelisted apps must be served over https. app_url.SchemeIs("https") && @@ -863,6 +865,7 @@ bool ChromeContentRendererClient::IsNaClAllowed( // scheme. Also allow invocations if they are from whitelisted URLs or // if --enable-nacl is set. bool is_nacl_allowed = is_nacl_unrestricted || + is_whitelisted_web_ui || is_whitelisted_app || is_nacl_pdf_viewer || is_invoked_by_hosted_app || |