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 d27d2ad5d14eeb1d1dae9de079f1b93362115d44..26a62c837a4bbddaba9d599828e89ce1224fb1b6 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -1037,8 +1037,7 @@ bool ChromeContentRendererClient::IsNaClAllowed( |
} |
bool is_hangouts_app = |
// Whitelisted apps must be served over secure scheme. |
- app_url.SchemeIs("https") && |
lgarron
2015/05/07 22:53:45
jiayl@: The definition of is_photo_app above check
jiayl
2015/05/08 21:23:40
Sounds good to me
|
- manifest_url.SchemeIsSecure() && |
+ app_url.SchemeIs("https") && manifest_url.SchemeIsCryptographic() && |
jochen (gone - plz use gerrit)
2015/05/08 17:14:21
why not app_url.SchemeIsCryptographic() ?
lgarron
2015/05/08 21:48:40
Updated in the second patch per jiayl@'s pseudo-lg
|
manifest_url.SchemeIsFileSystem() && |
(EndsWith(app_url_host, "talkgadget.google.com", false) || |
EndsWith(app_url_host, "plus.google.com", false) || |