Index: chrome/browser/ui/chrome_bubble_manager.cc |
diff --git a/chrome/browser/ui/chrome_bubble_manager.cc b/chrome/browser/ui/chrome_bubble_manager.cc |
index 40d08e667490f1a6b4fcc6399def3f07a6bbb9d5..12b81029fa0bb8012bbcdf6b88c294b8e266dde9 100644 |
--- a/chrome/browser/ui/chrome_bubble_manager.cc |
+++ b/chrome/browser/ui/chrome_bubble_manager.cc |
@@ -97,6 +97,9 @@ static void LogBubbleCloseReason(BubbleReference bubble, |
case BUBBLE_CLOSE_CANCELED: |
UMA_HISTOGRAM_SPARSE_SLOWLY("Bubbles.Close.Canceled", bubble_id); |
return; |
+ case BUBBLE_CLOSE_FRAME_DESTROYED: |
+ UMA_HISTOGRAM_SPARSE_SLOWLY("Bubbles.Close.FrameDestroyed", bubble_id); |
+ return; |
} |
NOTREACHED(); |
@@ -139,6 +142,14 @@ void ChromeBubbleManager::ActiveTabChanged(content::WebContents* old_contents, |
Observe(new_contents); |
} |
+void ChromeBubbleManager::FrameDeleted( |
+ content::RenderFrameHost* render_frame_host) { |
+ // When a frame is destroyed, bubbles spawned by that frame should default to |
+ // being closed, so that they can't traverse any references they hold to the |
+ // destroyed frame. |
+ CloseBubblesOwnedBy(render_frame_host); |
+} |
+ |
void ChromeBubbleManager::DidToggleFullscreenModeForTab( |
bool entered_fullscreen, bool will_cause_resize) { |
CloseAllBubbles(BUBBLE_CLOSE_FULLSCREEN_TOGGLED); |