Mac pop-up window happier-ness....

chrome/browser/cocoa/bookmark_bar_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 "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/bookmark_bar_bridge.h"
@@ skipping 104 matching lines @@
     // There is no offset to unconditionally apply.
     return;
   }
 
   // None of these locals are members of the Hall of Justice.
   NSRect superframe = [parentView_ frame];
   NSRect frame = [[self view] frame];
   NSRect webframe = [webContentView_ frame];
   if (apply) {
     superframe.size.height += kBookmarkBarSuperviewHeightAdjustment;
-    superframe.origin.y -= kBookmarkBarSuperviewHeightAdjustment;
+    // TODO(jrg): y=0 if we add the bookmark bar before the parent
+    // view (toolbar) is placed in the view hierarchy.  A different
+    // CL, where the bookmark bar is extracted from the toolbar nib,
+    // may fix this awkwardness.
+    if (superframe.origin.y > 0) {
+      superframe.origin.y -= kBookmarkBarSuperviewHeightAdjustment;
+      webframe.size.height -= kBookmarkBarWebframeHeightAdjustment;
+    }
     frame.size.height += kBookmarkBarHeight;
-    webframe.size.height -= kBookmarkBarWebframeHeightAdjustment;
   } else {
     superframe.size.height -= kBookmarkBarSuperviewHeightAdjustment;
     superframe.origin.y += kBookmarkBarSuperviewHeightAdjustment;
     frame.size.height -= kBookmarkBarHeight;
     webframe.size.height += kBookmarkBarWebframeHeightAdjustment;
   }
 
   // TODO(jrg): Animators can be a little fussy.  Setting these three
   // off can sometimes causes races where the finish isn't as
   // expected.  Fix, or clean out the animators as an option.
@@ skipping 245 matching lines @@
 - (void)nodeChildrenReordered:(BookmarkModel*)model
                          node:(const BookmarkNode*)node {
   [self loaded:model];
 }
 
 - (void)setDelegate:(id<BookmarkURLOpener>)delegate {
   delegate_ = delegate;
 }
 
 @end