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

components/bubble/bubble_manager.h

 // 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.
 
 #ifndef COMPONENTS_BUBBLE_BUBBLE_MANAGER_H_
 #define COMPONENTS_BUBBLE_BUBBLE_MANAGER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "components/bubble/bubble_close_reason.h"
 #include "components/bubble/bubble_reference.h"
 
 class BubbleDelegate;
 
+namespace content {
+class RenderFrameHost;
+}
+
 // Inherit from BubbleManager to show, update, and close bubbles.
 // Any class that inherits from BubbleManager should capture any events that
 // should dismiss a bubble or update its anchor point.
 // This class assumes that we won't be showing a lot of bubbles simultaneously.
 // TODO(hcarmona): Handle simultaneous bubbles. http://crbug.com/366937
 class BubbleManager {
  public:
   // This interface should be used to observe the manager. This is useful when
   // collecting metrics.
   class BubbleManagerObserver {
@@ skipping 34 matching lines @@
   // Add an observer for this BubbleManager.
   void AddBubbleManagerObserver(BubbleManagerObserver* observer);
 
   // Remove an observer from this BubbleManager.
   void RemoveBubbleManagerObserver(BubbleManagerObserver* observer);
 
  protected:
   // Will close any open bubbles and prevent new ones from being shown.
   void FinalizePendingRequests();
 
+  // Closes bubbles that declare |frame| as their owner, with
+  // a reason of BUBBLE_CLOSE_FRAME_DESTROYED.
+  void CloseBubblesOwnedBy(const content::RenderFrameHost* frame);
+
  private:
   enum ManagerState {
     SHOW_BUBBLES,
     NO_MORE_BUBBLES,
     ITERATING_BUBBLES,
   };
 
-  // All bubbles will get a close event for the specified |reason| if |match| is
-  // nullptr, otherwise only the bubble held by |match| will get a close event.
-  // Any bubble that is closed will also be deleted.
+  // All matching bubbles will get a close event for the specified |reason|. Any
+  // bubble that is closed will also be deleted. Bubbles match if 1) match is
+  // null or it refers to the bubble, and 2) frame is null or owns the bubble.
   bool CloseAllMatchingBubbles(BubbleController* match,

[hcarmona, 2016/02/05 22:48:24]

Can we rename these params to |bubble_match| and |frame_match|?
I think |match| made sense when it was the only condition that needed to be met.

[Peter Kasting, 2016/02/06 04:13:08]

I think |bubble| and |owner| would be better names.

[Jeffrey Yasskin, 2016/02/08 23:59:09]

I also like |bubble| and |owner|.

[hcarmona, 2016/02/09 00:31:05]

|bubble| and |owner| are fine.

+                               const content::RenderFrameHost* frame,
                                BubbleCloseReason reason);
 
   base::ObserverList<BubbleManagerObserver> observers_;
 
   // Verify that functions that affect the UI are done on the same thread.
   base::ThreadChecker thread_checker_;
 
   // Determines what happens to a bubble when |ShowBubble| is called.
   ManagerState manager_state_;
 
   // The bubbles that are being managed.
   ScopedVector<BubbleController> controllers_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleManager);
 };
 
 #endif  // COMPONENTS_BUBBLE_BUBBLE_MANAGER_H_