Make sure bubbles in Views default to close before their RenderFrameHosts.

components/bubble/bubble_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/bubble/bubble_manager.h"
 
 #include <utility>
 #include <vector>
 
 #include "components/bubble/bubble_controller.h"
@@ skipping 29 matching lines @@
       break;
   }
 
   return bubble_ref;
 }
 
 bool BubbleManager::CloseBubble(BubbleReference bubble,
                                 BubbleCloseReason reason) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_NE(manager_state_, ITERATING_BUBBLES);
-  return CloseAllMatchingBubbles(bubble.get(), reason);
+  return CloseAllMatchingBubbles(bubble.get(), nullptr, reason);
 }
 
 void BubbleManager::CloseAllBubbles(BubbleCloseReason reason) {
   // The following close reasons don't make sense for multiple bubbles:
   DCHECK_NE(reason, BUBBLE_CLOSE_ACCEPTED);
   DCHECK_NE(reason, BUBBLE_CLOSE_CANCELED);
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_NE(manager_state_, ITERATING_BUBBLES);
-  CloseAllMatchingBubbles(nullptr, reason);
+  CloseAllMatchingBubbles(nullptr, nullptr, reason);
 }
 
 void BubbleManager::UpdateAllBubbleAnchors() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_NE(manager_state_, ITERATING_BUBBLES);
 
   // Guard against bubbles being added or removed while iterating the bubbles.
   ManagerState original_state = manager_state_;
   manager_state_ = ITERATING_BUBBLES;
   for (auto controller : controllers_)
@@ skipping 12 matching lines @@
 
 void BubbleManager::FinalizePendingRequests() {
   // Return if already "Finalized".
   if (manager_state_ == NO_MORE_BUBBLES)
     return;
 
   manager_state_ = NO_MORE_BUBBLES;
   CloseAllBubbles(BUBBLE_CLOSE_FORCED);
 }
 
-bool BubbleManager::CloseAllMatchingBubbles(BubbleController* match,
-                                            BubbleCloseReason reason) {
+void BubbleManager::CloseBubblesOwnedBy(const content::RenderFrameHost* frame) {
+  CloseAllMatchingBubbles(nullptr, frame, BUBBLE_CLOSE_FRAME_DESTROYED);
+}
+
+bool BubbleManager::CloseAllMatchingBubbles(
+    BubbleController* bubble,
+    const content::RenderFrameHost* owner,
+    BubbleCloseReason reason) {
+  DCHECK(!bubble || !owner) << "It doesn't make sense to close a particular "
+                               "bubble iff it's owned by a particular frame.";

[Peter Kasting, 2016/02/09 02:10:52]

Nit: Rather than an output string here, I would leave a (more detailed) comment
above the DCHECK explaining a little about why this doesn't make sense (from the
info previously shared on the CR thread).

[Jeffrey Yasskin, 2016/02/09 20:54:44]

Done; how's this comment look?

+
   ScopedVector<BubbleController> close_queue;
 
   // Guard against bubbles being added or removed while iterating the bubbles.
   ManagerState original_state = manager_state_;
   manager_state_ = ITERATING_BUBBLES;
-  for (auto iter = controllers_.begin(); iter != controllers_.end();) {
-    if ((!match || match == *iter) && (*iter)->ShouldClose(reason)) {
-      close_queue.push_back(*iter);
-      iter = controllers_.weak_erase(iter);
+  for (auto i = controllers_.begin(); i != controllers_.end();) {
+    if ((!bubble || bubble == *i) && (!owner || (*i)->OwningFrameIs(owner)) &&
+        (*i)->ShouldClose(reason)) {
+      close_queue.push_back(*i);
+      i = controllers_.weak_erase(i);
     } else {
-      ++iter;
+      ++i;
     }
   }
   manager_state_ = original_state;
 
   for (auto controller : close_queue) {
     controller->DoClose();
 
     FOR_EACH_OBSERVER(BubbleManagerObserver, observers_,
                       OnBubbleClosed(controller->AsWeakPtr(), reason));
   }
 
   return !close_queue.empty();
 }