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 ffb0e8fb38fdb17272cc9541756ab27ca4150263..f9f17290a81c5c441d46c12a79c144b8f91f47b8 100644 |
--- a/chrome/browser/permissions/permission_context_base.cc |
+++ b/chrome/browser/permissions/permission_context_base.cc |
@@ -96,8 +96,8 @@ void PermissionContextBase::RequestPermission( |
<< " from an invalid URL: " << requesting_origin << "," |
<< embedding_origin << " (" << type_name |
<< " is not supported in popups)"; |
- NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
- false /* persist */, CONTENT_SETTING_BLOCK); |
+ NotifyPermissionSet(web_contents, id, requesting_origin, embedding_origin, |
+ callback, false /* persist */, CONTENT_SETTING_BLOCK); |
return; |
} |
@@ -109,8 +109,8 @@ void PermissionContextBase::RequestPermission( |
} |
if (content_setting == CONTENT_SETTING_ALLOW || |
content_setting == CONTENT_SETTING_BLOCK) { |
- NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
- false /* persist */, content_setting); |
+ NotifyPermissionSet(web_contents, id, requesting_origin, embedding_origin, |
+ callback, false /* persist */, content_setting); |
return; |
} |
@@ -203,8 +203,9 @@ void PermissionContextBase::DecidePermission( |
base::MakeUnique<PermissionRequestImpl>( |
requesting_origin, permission_type_, profile_, user_gesture, |
base::Bind(&PermissionContextBase::PermissionDecided, |
- weak_factory_.GetWeakPtr(), id, requesting_origin, |
- embedding_origin, user_gesture, callback), |
+ weak_factory_.GetWeakPtr(), web_contents, id, |
+ requesting_origin, embedding_origin, user_gesture, |
+ callback), |
base::Bind(&PermissionContextBase::CleanUpRequest, |
weak_factory_.GetWeakPtr(), id)); |
PermissionRequest* request = request_ptr.get(); |
@@ -220,8 +221,8 @@ void PermissionContextBase::DecidePermission( |
GetQueueController()->CreateInfoBarRequest( |
id, requesting_origin, embedding_origin, user_gesture, |
base::Bind(&PermissionContextBase::PermissionDecided, |
- weak_factory_.GetWeakPtr(), id, requesting_origin, |
- embedding_origin, user_gesture, callback, |
+ weak_factory_.GetWeakPtr(), web_contents, id, |
+ requesting_origin, embedding_origin, user_gesture, callback, |
// the queue controller takes care of persisting the |
// permission |
false)); |
@@ -232,6 +233,7 @@ void PermissionContextBase::DecidePermission( |
} |
void PermissionContextBase::PermissionDecided( |
+ content::WebContents* web_contents, |
const PermissionRequestID& id, |
const GURL& requesting_origin, |
const GURL& embedding_origin, |
@@ -269,8 +271,8 @@ void PermissionContextBase::PermissionDecided( |
content_setting = CONTENT_SETTING_BLOCK; |
} |
- NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
- persist, content_setting); |
+ NotifyPermissionSet(web_contents, id, requesting_origin, embedding_origin, |
+ callback, persist, content_setting); |
} |
#if defined(OS_ANDROID) |
@@ -284,6 +286,7 @@ Profile* PermissionContextBase::profile() const { |
} |
void PermissionContextBase::NotifyPermissionSet( |
+ content::WebContents* web_contents, |
const PermissionRequestID& id, |
const GURL& requesting_origin, |
const GURL& embedding_origin, |