Index: chrome/browser/permissions/permission_context_base.cc |
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc |
index 873b2bea3d8de3b0f49c5c9a925af4eb0905e237..375e628e3d793ce4d870bdfcd94a615773211ef5 100644 |
--- a/chrome/browser/permissions/permission_context_base.cc |
+++ b/chrome/browser/permissions/permission_context_base.cc |
@@ -177,10 +177,10 @@ void PermissionContextBase::DecidePermission( |
if (!permission_request_manager) |
return; |
std::unique_ptr<PermissionRequest> request_ptr(new PermissionRequestImpl( |
- requesting_origin, permission_type_, profile_, |
+ requesting_origin, permission_type_, user_gesture, profile_, |
base::Bind(&PermissionContextBase::PermissionDecided, |
weak_factory_.GetWeakPtr(), id, requesting_origin, |
- embedding_origin, callback), |
+ embedding_origin, user_gesture, callback), |
base::Bind(&PermissionContextBase::CleanUpRequest, |
weak_factory_.GetWeakPtr(), id))); |
PermissionRequest* request = request_ptr.get(); |
@@ -190,11 +190,13 @@ void PermissionContextBase::DecidePermission( |
DCHECK(inserted) << "Duplicate id " << id.ToString(); |
permission_request_manager->AddRequest(request); |
#else |
+ // TODO(stefanocs): Pass |user_gesture| to CreateInfoBarRequest to record |
+ // permission actions in infobar. |
GetQueueController()->CreateInfoBarRequest( |
id, requesting_origin, embedding_origin, |
base::Bind(&PermissionContextBase::PermissionDecided, |
weak_factory_.GetWeakPtr(), id, requesting_origin, |
- embedding_origin, callback, |
+ embedding_origin, user_gesture, callback, |
// the queue controller takes care of persisting the |
// permission |
false)); |
@@ -205,6 +207,7 @@ void PermissionContextBase::PermissionDecided( |
const PermissionRequestID& id, |
const GURL& requesting_origin, |
const GURL& embedding_origin, |
+ bool user_gesture, |
const BrowserPermissionCallback& callback, |
bool persist, |
ContentSetting content_setting) { |
@@ -214,16 +217,17 @@ void PermissionContextBase::PermissionDecided( |
if (persist) { |
DCHECK(content_setting == CONTENT_SETTING_ALLOW || |
content_setting == CONTENT_SETTING_BLOCK); |
- if (content_setting == CONTENT_SETTING_ALLOW) |
- PermissionUmaUtil::PermissionGranted(permission_type_, requesting_origin, |
- profile_); |
- else |
- PermissionUmaUtil::PermissionDenied(permission_type_, requesting_origin, |
- profile_); |
+ if (content_setting == CONTENT_SETTING_ALLOW) { |
+ PermissionUmaUtil::PermissionGranted(permission_type_, user_gesture, |
+ requesting_origin, profile_); |
+ } else { |
+ PermissionUmaUtil::PermissionDenied(permission_type_, user_gesture, |
+ requesting_origin, profile_); |
+ } |
} else { |
DCHECK_EQ(content_setting, CONTENT_SETTING_DEFAULT); |
- PermissionUmaUtil::PermissionDismissed(permission_type_, requesting_origin, |
- profile_); |
+ PermissionUmaUtil::PermissionDismissed(permission_type_, user_gesture, |
+ requesting_origin, profile_); |
} |
#endif |