Index: chrome/browser/content_settings/permission_context_base.cc |
diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc |
index d80f3d413cc9b0b6fe91eae2028f3765f8c91b34..5bdc58cee39c10ea802ccad6a1ab85d093591789 100644 |
--- a/chrome/browser/content_settings/permission_context_base.cc |
+++ b/chrome/browser/content_settings/permission_context_base.cc |
@@ -110,6 +110,7 @@ void PermissionContextBase::DecidePermission( |
return; |
} |
+ // Some permissions may not be used over unsecured http. |
mlamouri (slow - plz ping)
2015/06/22 22:10:57
I would prefer to avoid this comment because the g
jww
2015/06/23 05:32:58
Additionally, "what is a secure origin" is defined
keenanb
2015/06/24 22:26:10
Done.
|
if (IsRestrictedToSecureOrigins() && |
!content::IsOriginSecure(requesting_origin)) { |
NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
@@ -131,7 +132,8 @@ void PermissionContextBase::DecidePermission( |
} |
PermissionContextUmaUtil::PermissionRequested( |
- permission_type_, requesting_origin); |
+ permission_type_, profile_->GetHostContentSettingsMap(), |
+ requesting_origin, embedding_origin); |
if (PermissionBubbleManager::Enabled()) { |
if (pending_bubbles_.get(id.ToString()) != NULL) |