Index: chrome/browser/push_messaging/push_messaging_permission_context.cc |
diff --git a/chrome/browser/push_messaging/push_messaging_permission_context.cc b/chrome/browser/push_messaging/push_messaging_permission_context.cc |
index c7ae1750f57f4c5a3353d2fa372b2103ed72b1ec..73945043e2bc142823ac46237a5f71948614bb3c 100644 |
--- a/chrome/browser/push_messaging/push_messaging_permission_context.cc |
+++ b/chrome/browser/push_messaging/push_messaging_permission_context.cc |
@@ -90,7 +90,7 @@ void PushMessagingPermissionContext::DecidePermission( |
requesting_origin, user_gesture, |
base::Bind(&PushMessagingPermissionContext::DecidePushPermission, |
weak_factory_ui_thread_.GetWeakPtr(), id, requesting_origin, |
- embedding_origin, callback)); |
+ embedding_origin, user_gesture, callback)); |
#else |
NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
false /* persist */, CONTENT_SETTING_BLOCK); |
@@ -105,6 +105,7 @@ void PushMessagingPermissionContext::DecidePushPermission( |
const PermissionRequestID& id, |
const GURL& requesting_origin, |
const GURL& embedding_origin, |
+ bool user_gesture, |
raymes
2016/07/18 00:58:43
I would say don't bother passing this for now sinc
stefanocs
2016/07/18 04:28:45
Done.
|
const BrowserPermissionCallback& callback, |
blink::mojom::PermissionStatus notification_status) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
@@ -118,8 +119,8 @@ void PushMessagingPermissionContext::DecidePushPermission( |
if (push_content_setting == CONTENT_SETTING_BLOCK) { |
DVLOG(1) << "Push permission was explicitly blocked."; |
- PermissionUmaUtil::PermissionDenied(permission_type(), requesting_origin, |
- profile_); |
+ PermissionUmaUtil::PermissionDenied(permission_type(), user_gesture, |
+ requesting_origin, profile_); |
NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
true /* persist */, CONTENT_SETTING_BLOCK); |
return; |
@@ -132,8 +133,8 @@ void PushMessagingPermissionContext::DecidePushPermission( |
return; |
} |
- PermissionUmaUtil::PermissionGranted(permission_type(), requesting_origin, |
- profile_); |
+ PermissionUmaUtil::PermissionGranted(permission_type(), user_gesture, |
+ requesting_origin, profile_); |
NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
true /* persist */, CONTENT_SETTING_ALLOW); |
} |