| Index: chrome/browser/permissions/permission_manager.cc
|
| diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
|
| index 9b54d1561e26c849784bc26e3e3bdc83f83db3b5..d0e2d0a3b2372513bd129efcbae381e8d2a33639 100644
|
| --- a/chrome/browser/permissions/permission_manager.cc
|
| +++ b/chrome/browser/permissions/permission_manager.cc
|
| @@ -389,6 +389,22 @@ void PermissionManager::ResetPermission(PermissionType permission,
|
| }
|
|
|
| PermissionStatus PermissionManager::GetPermissionStatus(
|
| + HostContentSettingsMap* host,
|
| + content::PermissionType permission,
|
| + const GURL& requesting_origin,
|
| + const GURL& embedding_origin) {
|
| + if (IsConstantPermission(permission))
|
| + return GetPermissionStatusForConstantPermission(permission);
|
| +
|
| + PermissionContextBase* context = GetPermissionContext(permission);
|
| + if (!context)
|
| + return PermissionStatus::DENIED;
|
| +
|
| + return ContentSettingToPermissionStatus(context->GetPermissionStatus(
|
| + host, requesting_origin.GetOrigin(), embedding_origin.GetOrigin()));
|
| +}
|
| +
|
| +PermissionStatus PermissionManager::GetPermissionStatus(
|
| PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) {
|
|
|