[PermissionBubble] Remove bubble from previous manager.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 2012 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 377 matching lines @@
         NSRect frame = [[self window] frame];
         frame.size.height += convertedSize.height;
         frame.origin.y -= convertedSize.height;
         [[self window] setFrame:frame display:NO];
       }
     }
 
     // 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
             selector:@selector(applicationDidHide:)
                 name:NSApplicationDidHideNotification
               object:nil];
     [[NSNotificationCenter defaultCenter]
          addObserver:self
             selector:@selector(applicationDidUnhide:)
                 name:NSApplicationDidUnhideNotification
@@ skipping 851 matching lines @@
 }
 
 - (void)setStarredState:(BOOL)isStarred {
   [toolbarController_ setStarredState:isStarred];
 }
 
 - (void)setCurrentPageIsTranslated:(BOOL)on {
   [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];
 }
 
 // Return the rect, in WebKit coordinates (flipped), of the window's grow box
 // in the coordinate system of the content area of the currently selected tab.
 // |windowGrowBox| needs to be in the window's coordinate system.
 - (NSRect)selectedTabGrowBoxRect {
   NSWindow* window = [self window];
   if (![window respondsToSelector:@selector(_growBoxRect)])
@@ skipping 362 matching lines @@
   windowShim_->UpdateTitleBar();
 
   // Update the bookmark bar.
   // TODO(viettrungluu): perhaps update to not terminate running animations (if
   // applicable)?
   windowShim_->BookmarkBarStateChanged(
       BookmarkBar::DONT_ANIMATE_STATE_CHANGE);
 
   [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
                                         withProfile:browser_->profile()];
 }
 
 - (void)onTabChanged:(TabStripModelObserver::TabChangeType)change
         withContents:(WebContents*)contents {
   // Update titles if this is the currently selected tab and if it isn't just
   // the loading state which changed.
@@ skipping 550 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)