[PermissionBubble] Remove bubble from previous manager.

chrome/browser/ui/cocoa/browser_window_controller.mm

Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index b176b641400a2f937443ab322da898476ab793bf..b33ec488621ba561c59ebb17e5724564451745a7 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -395,9 +395,6 @@ using content::WebContents;
     // Create the bridge for the status bubble.
     statusBubble_ = new StatusBubbleMac([self window], self);
 
-    // Create the permissions bubble.
-    permissionBubbleCocoa_.reset(new PermissionBubbleCocoa([self window]));
-
     // Register for application hide/unhide notifications.
     [[NSNotificationCenter defaultCenter]
          addObserver:self
@@ -1269,6 +1266,26 @@ using content::WebContents;
   [toolbarController_ setTranslateIconLit:on];
 }
 
+- (void)onActiveTabChanged:(content::WebContents*)oldContents

[rohitrao (ping after 24h), 2015/05/15 18:38:02]

How is this different from onActivateTabWithContents?  Should the two be
combined somehow?

[groby-ooo-7-16, 2015/05/15 19:06:58]

onActivateTabWithContents is called at a very specific point in sequence of
events - the old contents have gone, and the view has been switched out for a
view with the new web contents. Semantically, the old contents have no meaning
for that function, so I'd prefer not to pass them in anyways.

It's also part of the TabStripController, not the BrowserWindowController, so it
would have to get very roundabout access to the permission bubble.

For more comments on this mess, see crbug.com/340720

(Also: This is part of a series of CLs. I'm ultimately planning to hoist all
this out into platform-independent code, because there is nothing
platform-specific here. It'll just require quite a bit of shuffling, so I'm
doing it in small steps)

+                        to:(content::WebContents*)newContents {
+  // No need to remove previous bubble. It will close itself.
+  PermissionBubbleManager* manager(nullptr);
+  if (oldContents) {
+    manager = PermissionBubbleManager::FromWebContents(oldContents);
+    if (manager)
+      manager->SetView(nullptr);
+  }
+
+  if (newContents) {
+    if (!permissionBubbleCocoa_.get()) {
+      permissionBubbleCocoa_.reset(new PermissionBubbleCocoa([self window]));
+    }
+    manager = PermissionBubbleManager::FromWebContents(newContents);
+    if (manager)
+      manager->SetView(permissionBubbleCocoa_.get());
+  }
+}
+
 - (void)zoomChangedForActiveTab:(BOOL)canShowBubble {
   [toolbarController_ zoomChangedForActiveTab:canShowBubble];
 }
@@ -1651,14 +1668,6 @@ using content::WebContents;
 
   [infoBarContainerController_ changeWebContents:contents];
 
-  // No need to remove previous bubble. It will close itself.
-  // TODO(leng):  The PermissionBubbleManager for the previous contents should
-  // have SetView(NULL) called.  Fix this when the previous contents are
-  // available here or move to BrowserWindowCocoa::OnActiveTabChanged().
-  // crbug.com/340720
-  PermissionBubbleManager::FromWebContents(contents)->SetView(
-      permissionBubbleCocoa_.get());
-
   // Must do this after bookmark and infobar updates to avoid
   // unnecesary resize in contents.
   [devToolsController_ updateDevToolsForWebContents:contents