[Mac] Tear down extension-installed bubble before main window closes.

chrome/browser/ui/cocoa/base_bubble_controller.mm

 // Copyright (c) 2011 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/base_bubble_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/string_util.h"
@@ skipping 139 matching lines @@
 // position).  We cannot have an addChildWindow: and a subsequent
 // showWindow:. Thus, we have our own version.
 - (void)showWindow:(id)sender {
   NSWindow* window = [self window];  // completes nib load
   [self updateOriginFromAnchor];
   [parentWindow_ addChildWindow:window ordered:NSWindowAbove];
   [window makeKeyAndOrderFront:self];
 }
 
 - (void)close {
-  [parentWindow_ removeChildWindow:[self window]];
+  [[[self window] parentWindow] removeChildWindow:[self window]];
   [super close];
 }
 
 // The controller is the delegate of the window so it receives did resign key
 // notifications. When key is resigned mirror Windows behavior and close the
 // window.
 - (void)windowDidResignKey:(NSNotification*)notification {
   NSWindow* window = [self window];
   DCHECK_EQ([notification object], window);
   if ([window isVisible]) {
@@ skipping 20 matching lines @@
   if ([bubble_ arrowLocation] == info_bubble::kTopRight) {
     origin.x -= NSWidth([window frame]) - offsets.width;
   } else {
     origin.x -= offsets.width;
   }
   origin.y -= NSHeight([window frame]);
   [window setFrameOrigin:origin];
 }
 
 @end  // BaseBubbleController