Fix some infobar problems.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 2012 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/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 1939 matching lines @@
   return [toolbarController_ customFieldEditorForObject:obj];
 }
 
 // (Needed for |BookmarkBarControllerDelegate| protocol.)
 - (void)bookmarkBar:(BookmarkBarController*)controller
  didChangeFromState:(BookmarkBar::State)oldState
             toState:(BookmarkBar::State)newState {
   [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]];
   [self adjustToolbarAndBookmarkBarForCompression:
           [controller getDesiredToolbarHeightCompression]];
+
+  // Stretch the top infobar's arrow if the bookmark has been shown.
+  NSInteger arrowHeight = [infoBarContainerController_ defaultArrowHeight];
+  if (newState == BookmarkBar::SHOW)
+    arrowHeight += controller.view.frame.size.height;
+  [infoBarContainerController_ setMaxTopArrowHeight:arrowHeight];
 }
 
 // (Needed for |BookmarkBarControllerDelegate| protocol.)
 - (void)bookmarkBar:(BookmarkBarController*)controller
 willAnimateFromState:(BookmarkBar::State)oldState
             toState:(BookmarkBar::State)newState {
   [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]];
   [self adjustToolbarAndBookmarkBarForCompression:
           [controller getDesiredToolbarHeightCompression]];
+
+  // Shorten the top infobar's arrow if the bookmark is going to be hidden
+  // or detached.
+  NSInteger arrowHeight = [infoBarContainerController_ defaultArrowHeight];
+  if (newState != BookmarkBar::SHOW)
+    [infoBarContainerController_ setMaxTopArrowHeight:arrowHeight];
 }
 
 // (Private/TestingAPI)
 - (void)resetWindowGrowthState {
   windowTopGrowth_ = 0;
   windowBottomGrowth_ = 0;
   isShrinkingFromZoomed_ = NO;
 }
 
 - (NSSize)overflowFrom:(NSRect)source
@@ skipping 317 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)