Chromium Code Reviews| Index: chrome/browser/content_settings/permission_context_base.cc |
| diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc |
| index 45ce75a0411c18d31d177a7b6d126e7ac54eedf4..20d0e672d9330c35b817b2d83b47c4ee8371e7a8 100644 |
| --- a/chrome/browser/content_settings/permission_context_base.cc |
| +++ b/chrome/browser/content_settings/permission_context_base.cc |
| @@ -117,6 +117,13 @@ void PermissionContextBase::DecidePermission( |
| PermissionContextUmaUtil::PermissionRequested( |
| permission_type_, requesting_origin); |
| + // The request should only be null if the request_ptr has destructed, which |
| + // should not normally happen before this invoked. |
| + // TODO(felt): crbug.com/433877, where a bug causes this to occur. |
| + DCHECK(pending_bubbles_.get(id.ToString()) != NULL); |
|
groby-ooo-7-16
2015/01/28 22:47:00
Please don't do that - style guide explicitly call
felt
2015/01/29 06:06:06
Done. Picked error handling.
|
| + if (pending_bubbles_.get(id.ToString()) != NULL) |
| + return; |
| + |
| if (PermissionBubbleManager::Enabled()) { |
| PermissionBubbleManager* bubble_manager = |
| PermissionBubbleManager::FromWebContents(web_contents); |