First cut at infobars on Mac. These are not expected to be...

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 26 matching lines @@
 const CGFloat kDefaultBookmarkWidth = 150.0;
 const CGFloat kBookmarkVerticalPadding = 2.0;
 const CGFloat kBookmarkHorizontalPadding = 8.0;
 };
 
 @implementation BookmarkBarController
 
 - (id)initWithProfile:(Profile*)profile
            parentView:(NSView*)parentView
        webContentView:(NSView*)webContentView
+         infoBarsView:(NSView*)infoBarsView
              delegate:(id<BookmarkURLOpener>)delegate {
   if ((self = [super initWithNibName:@"BookmarkBar"
                               bundle:mac_util::MainAppBundle()])) {
     bookmarkModel_ = profile->GetBookmarkModel();
     preferences_ = profile->GetPrefs();
     parentView_ = parentView;
     webContentView_ = webContentView;
+    infoBarsView_ = infoBarsView;
     delegate_ = delegate;
   }
   return self;
 }
 
 - (void)awakeFromNib {
   // We default to NOT open, which means height=0.
   DCHECK([[self view] isHidden]);  // Hidden so it's OK to change.
   NSRect frame = [[self view] frame];
   frame.size.height = 0;
@@ skipping 49 matching lines @@
   }
   if (!contentViewHasOffset_ && apply) {
     // 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];
+  NSRect infoframe = [infoBarsView_ frame];
   if (apply) {
     superframe.size.height += 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;
+    infoframe.origin.y -= kBookmarkBarWebframeHeightAdjustment;
   } else {
     superframe.size.height -= kBookmarkBarSuperviewHeightAdjustment;
     superframe.origin.y += kBookmarkBarSuperviewHeightAdjustment;
     frame.size.height -= kBookmarkBarHeight;
     webframe.size.height += kBookmarkBarWebframeHeightAdjustment;
+    infoframe.origin.y += 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.
   // Odd racing is FAR worse than a lack of an animator.
   if (1 /* immediately */) {
     [parentView_ setFrame:superframe];
     [webContentView_ setFrame:webframe];
+    [infoBarsView_ setFrame:infoframe];
     [[self view] setFrame:frame];
   } else {
     [[parentView_ animator] setFrame:superframe];
     [[webContentView_ animator] setFrame:webframe];
+    [[infoBarsView_ animator] setFrame:infoframe];
     [[[self view] animator] setFrame:frame];
   }
 
   [[self view] setNeedsDisplay:YES];
   [parentView_ setNeedsDisplay:YES];
   [webContentView_ setNeedsDisplay:YES];
+  [infoBarsView_ setNeedsDisplay:YES];
 }
 
 - (BOOL)isBookmarkBarVisible {
   return barShouldBeShown_;
 }
 
 // We don't change a preference; we only change visibility.
 // Preference changing (global state) is handled in
 // BrowserWindowCocoa::ToggleBookmarkBar().
 - (void)toggleBookmarkBar {
@@ skipping 221 matching lines @@
 - (void)nodeChildrenReordered:(BookmarkModel*)model
                          node:(const BookmarkNode*)node {
   [self loaded:model];
 }
 
 - (void)setDelegate:(id<BookmarkURLOpener>)delegate {
   delegate_ = delegate;
 }
 
 @end