Fix multi-window bookmark bubble problem....

chrome/browser/cocoa/bookmark_bubble_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 "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/cocoa/bookmark_bubble_controller.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 40 matching lines @@
     node_ = node;
     alreadyBookmarked_ = alreadyBookmarked;
   }
   return self;
 }
 
 - (void)windowWillClose:(NSNotification *)notification {
   [self autorelease];
 }
 
-- (void)windowDidLoad {
-  NSWindow* window = [self window];
+
+// We want this to be a child of a browser window.  addChildWindow:
+// (called from this function) will bring the window on-screen;
+// unfortunately, [NSWindowController showWindow:] will also bring it
+// on-screen (but will cause unexpected changes to the window's
+// 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
   NSPoint origin = [parentWindow_ convertBaseToScreen:topLeftForBubble_];
   origin.y -= NSHeight([window frame]);
   [window setFrameOrigin:origin];
   [parentWindow_ addChildWindow:window ordered:NSWindowAbove];
   // Default is IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK; "Bookmark".
   // If adding for the 1st time the string becomes "Bookmark Added!"
   if (!alreadyBookmarked_) {
     NSString* title =
         l10n_util::GetNSString(IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED);
     [bigTitle_ setStringValue:title];
   }
 
   [self fillInFolderList];
+
+  [[self window] makeKeyAndOrderFront:self];
 }
 
 - (void)close {
   [parentWindow_ removeChildWindow:[self window]];
+  [delegate_ bubbleWindowWillClose:[self window]];
   [super close];
 }
 
 // Shows the bookmark editor sheet for more advanced editing.
 - (void)showEditor {
   [self ok:nil];
   [delegate_ editBookmarkNode:node_];
 }
 
 - (IBAction)edit:(id)sender {
@@ skipping 37 matching lines @@
     [self showEditor];
   }
 }
 
 // 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 {
   DCHECK_EQ([notification object], [self window]);
 
+  // We must tell our delegate our window is gone RIGHT NOW.  The
+  // performSelector: call below triggers a close but it might get
+  // processed after a request to show a new bubble (e.g. in another
+  // window).
+  [delegate_ bubbleWindowWillClose:[self window]];
+
   // Can't call close from within a window delegate method. Call close for the
   // next time through the event loop.
   [self performSelector:@selector(ok:) withObject:self afterDelay:0];
 }
 
 // Look at the dialog; if the user has changed anything, update the
 // bookmark node to reflect this.
 - (void)updateBookmarkNode {
   if (!node_) return;
 
@@ skipping 86 matching lines @@
   NSInteger idx = [menu indexOfItemWithRepresentedObject:parentValue];
   DCHECK(idx != -1);
   [folderPopUpButton_ selectItemAtIndex:idx];
 }
 
 - (NSPopUpButton*)folderPopUpButton {
   return folderPopUpButton_;
 }
 
 @end  // implementation BookmarkBubbleController(ExposedForUnitTesting)