Set bookmark bar menu windows to the correct level....

chrome/browser/cocoa/bookmark_bar_folder_controller.mm

 // Copyright (c) 2010 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/cocoa/bookmark_bar_folder_controller.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/bookmark_bar_constants.h"  // namespace bookmarks
@@ skipping 195 matching lines @@
                                   bookmarks::kBookmarkVerticalPadding));
     NSPoint topOfWindow =
         [[parentButton_ window]
             convertBaseToScreen:[[parentButton_ superview]
                                     convertPoint:top toView:nil]];
     newWindowTopLeft.y = topOfWindow.y;
   }
   return newWindowTopLeft;
 }
 
+// Set our window level to the right spot so we're above the menubar, dock, etc.
+// Factored out so we can override/noop in a unit test.
+- (void)configureWindowLevel {
+  [[self window] setLevel:NSPopUpMenuWindowLevel];
+}
+
 // Determine window size and position.
 // Create buttons for all our nodes.
 // TODO(jrg): break up into more and smaller routines for easier unit testing.
 - (void)configureWindow {
   NSPoint newWindowTopLeft = [self windowTopLeft];
   const BookmarkNode* node = [parentButton_ bookmarkNode];
   DCHECK(node);
   int startingIndex = [[parentButton_ cell] startingChildIndex];
   DCHECK_LE(startingIndex, node->GetChildCount());
   // Must have at least 1 button (for "empty")
@@ skipping 71 matching lines @@
   if ([[self window] screen]) {  // nil in unit tests
     const CGFloat padding = 8;
     NSRect screen = [[[self window] screen] frame];
     if (NSMaxX(windowFrame) + padding > NSMaxX(screen))
       windowFrame.origin.x -= NSMaxX(windowFrame) + padding - NSMaxX(screen);
     else if (NSMinX(windowFrame) - padding < NSMinX(screen))
       windowFrame.origin.x += NSMinX(screen) - NSMinX(windowFrame) + padding;
   }
 
   [[self window] setFrame:windowFrame display:YES];
-
-  // This is what we want, but it won't work so long as we're a child
-  // window of something at a different level.  To fix (make not a
-  // child) would break other things (e.g. Expose').  I really need a
-  // modal loop for the bookmark menus.  TODO(jrg)
-  // [[self window] setLevel:NSPopUpMenuWindowLevel];
-
-  [[parentController_ parentWindow] addChildWindow:[self window]
-                                           ordered:NSWindowAbove];
+  [self configureWindowLevel];
 }
 
 // Start a "scroll up" timer.
 - (void)beginScrollWindowUp {
   [self addScrollTimerWithDelta:kBookmarkBarFolderScrollAmount];
 }
 
 // Start a "scroll down" timer.
 - (void)beginScrollWindowDown {
   [self addScrollTimerWithDelta:-kBookmarkBarFolderScrollAmount];
@@ skipping 128 matching lines @@
   } else {
     // If there is no hoverOpen but we've exited our window, we may be
     // in a subfolder.  Restore our state so it's cleaned up later.
     hoverButton_.reset([button retain]);
   }
 }
 
 // Delegate callback.
 - (void)windowWillClose:(NSNotification*)notification {
   [parentController_ childFolderWillClose:self];
-  [[self parentWindow] removeChildWindow:[self window]];
   [self closeBookmarkFolder:self];
   [self autorelease];
 }
 
 - (BookmarkButton*)parentButton {
   return parentButton_.get();
 }
 
 // Ugh... copied from bookmark_bar_controller.mm
 // Is it worth it to factor out for, essentially, 2 lines?
@@ skipping 347 matching lines @@
                                             initWithParentButton:parentButton
                                                 parentController:self];
   [folderController_ showWindow:self];
 }
 
 - (NSArray*)buttons {
   return buttons_.get();
 }
 
 @end  // BookmarkBarFolderController