diff options
author | mlamouri <mlamouri@chromium.org> | 2015-03-23 11:24:18 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-23 18:25:03 +0000 |
commit | 2bb0feb026e70d97ee92cb72fe5c93e43eaa5c32 (patch) | |
tree | 1f2d507ce0f619fc619ecd43629eb79b72d08860 /chrome/browser/content_settings | |
parent | 6f487af246f32806833f2288ecef4fcfa9d0e83f (diff) | |
download | chromium_src-2bb0feb026e70d97ee92cb72fe5c93e43eaa5c32.zip chromium_src-2bb0feb026e70d97ee92cb72fe5c93e43eaa5c32.tar.gz chromium_src-2bb0feb026e70d97ee92cb72fe5c93e43eaa5c32.tar.bz2 |
It is possible to sometimes have a null PermissionBubbleManager.
BUG=457091
Review URL: https://codereview.chromium.org/1023213002
Cr-Commit-Position: refs/heads/master@{#321812}
Diffstat (limited to 'chrome/browser/content_settings')
-rw-r--r-- | chrome/browser/content_settings/permission_context_base.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc index 711dbe5..8868965 100644 --- a/chrome/browser/content_settings/permission_context_base.cc +++ b/chrome/browser/content_settings/permission_context_base.cc @@ -125,7 +125,10 @@ void PermissionContextBase::DecidePermission( return; PermissionBubbleManager* bubble_manager = PermissionBubbleManager::FromWebContents(web_contents); - DCHECK(bubble_manager); + // TODO(mlamouri): sometimes |bubble_manager| is null. This check is meant + // to prevent crashes. See bug 457091. + if (!bubble_manager) + return; scoped_ptr<PermissionBubbleRequest> request_ptr( new PermissionBubbleRequestImpl( requesting_origin, user_gesture, permission_type_, |