Fix multi-window bookmark bubble problem....

chrome/browser/cocoa/browser_window_controller.mm

 // Copyright (c) 2009 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 <Carbon/Carbon.h>
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/scoped_nsdisable_screen_updates.h"
 #import "base/scoped_nsobject.h"
@@ skipping 1154 matching lines @@
     BookmarkModel* model = browser_->profile()->GetBookmarkModel();
     const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url);
     NSPoint topLeft = [self topLeftForBubble];
     bookmarkBubbleController_ =
         [[BookmarkBubbleController alloc] initWithDelegate:self
                                               parentWindow:[self window]
                                           topLeftForBubble:topLeft
                                                      model:model
                                                       node:node
                                          alreadyBookmarked:alreadyBookmarked];
-    NSWindow* bookmarkBubbleWindow = [bookmarkBubbleController_ window];
-    NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
-    [nc addObserver:self
-           selector:@selector(bubbleWindowWillClose:)
-               name:NSWindowWillCloseNotification
-             object:bookmarkBubbleWindow];
     [bookmarkBubbleController_ showWindow:self];
   }
 }
 
-// Notification sent when our bubble window is closed.
-- (void)bubbleWindowWillClose:(NSNotification*)notification {
-  DCHECK([[notification object] windowController] == bookmarkBubbleController_);
-  NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
-  [nc removeObserver:self
-                name:NSWindowWillCloseNotification
-              object:[bookmarkBubbleController_ window]];
-  bookmarkBubbleController_ = nil;
+// Implement BookmarkBubbleControllerDelegate.
+- (void)bubbleWindowWillClose:(NSWindow*)window {
+  if (window == [bookmarkBubbleController_ window])
+    bookmarkBubbleController_ = nil;
 }
 
-// Implement BookmarkBubbleControllerDelegate
+// Implement BookmarkBubbleControllerDelegate.
 - (void)editBookmarkNode:(const BookmarkNode*)node {
   // A BookmarkEditorController is a sheet that owns itself, and
   // deallocates itself when closed.
   [[[BookmarkEditorController alloc]
      initWithParentWindow:[self window]
                   profile:browser_->profile()
                    parent:node->GetParent()
                      node:node
             configuration:BookmarkEditor::SHOW_TREE
                   handler:NULL]
@@ skipping 462 matching lines @@
   if (frameOverlayInactiveImage) {
     [theme setValue:frameOverlayInactiveImage
        forAttribute:@"overlay"
               style:GTMThemeStyleWindow
               state:GTMThemeStateInactiveWindow];
   }
 
   return theme;
 }
 @end