Chromium Code Reviews| 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 2e939320d74c995138a5caaf1f52dc0d30239fe2..cf712d12b9edd91bf94187be7bb9e3615d4b1db6 100644 |
| --- a/chrome/browser/permissions/permission_context_base.cc |
| +++ b/chrome/browser/permissions/permission_context_base.cc |
| @@ -178,10 +178,10 @@ void PermissionContextBase::DecidePermission( |
| return; |
| std::unique_ptr<PermissionBubbleRequest> request_ptr( |
| new PermissionBubbleRequestImpl( |
| - 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::CleanUpBubble, |
| weak_factory_.GetWeakPtr(), id))); |
| PermissionBubbleRequest* request = request_ptr.get(); |
| @@ -191,11 +191,12 @@ void PermissionContextBase::DecidePermission( |
| DCHECK(inserted) << "Duplicate id " << id.ToString(); |
| permission_request_manager->AddRequest(request); |
| #else |
| + // TODO(stefanocs): Get user gesture from infobar. |
|
raymes
2016/07/18 00:58:43
Hmm, what does this mean?
stefanocs
2016/07/18 04:28:44
I edited the comment, does it make sense for you o
raymes
2016/07/18 07:31:58
Looks good, thanks!
|
| 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)); |
| @@ -206,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) { |
| @@ -216,15 +218,15 @@ void PermissionContextBase::PermissionDecided( |
| DCHECK(content_setting == CONTENT_SETTING_ALLOW || |
| content_setting == CONTENT_SETTING_BLOCK); |
| if (content_setting == CONTENT_SETTING_ALLOW) |
|
raymes
2016/07/18 00:58:43
nit: add {}
stefanocs
2016/07/18 04:28:45
Done.
|
| - PermissionUmaUtil::PermissionGranted(permission_type_, requesting_origin, |
| - profile_); |
| + PermissionUmaUtil::PermissionGranted(permission_type_, user_gesture, |
| + requesting_origin, profile_); |
| else |
|
raymes
2016/07/18 00:58:43
nit: add {}
stefanocs
2016/07/18 04:28:44
Done.
|
| - PermissionUmaUtil::PermissionDenied(permission_type_, requesting_origin, |
| - profile_); |
| + 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 |