Mac: Animate the bookmark bar showing/hiding.

chrome/browser/cocoa/toolbar_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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/bubble_positioner.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/back_forward_menu_controller.h"
+#import "chrome/browser/cocoa/background_gradient_view.h"
 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/cocoa/gradient_button_cell.h"
 #import "chrome/browser/cocoa/location_bar_view_mac.h"
 #import "chrome/browser/cocoa/menu_button.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
@@ skipping 10 matching lines @@
 static NSString* const kStarButtonImageName = @"star_Template.pdf";
 static NSString* const kStarButtonFillingImageName = @"starred.pdf";
 static NSString* const kGoButtonGoImageName = @"go_Template.pdf";
 static NSString* const kGoButtonStopImageName = @"stop_Template.pdf";
 static NSString* const kPageButtonImageName = @"menu_page_Template.pdf";
 static NSString* const kWrenchButtonImageName = @"menu_chrome_Template.pdf";
 
 // Height of the toolbar in pixels when the bookmark bar is closed.
 static const float kBaseToolbarHeight = 36.0;
 
-// Overlap (in pixels) between the toolbar and the bookmark bar.
-static const float kBookmarkBarOverlap = 6.0;
-
 @interface ToolbarController(Private)
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(std::wstring*)prefName;
+- (BackgroundGradientView*)backgroundGradientView;
 - (void)browserActionsChanged;
 - (void)adjustLocationAndGoPositionsBy:(CGFloat)dX;
 @end
 
 namespace {
 
 // A C++ class used to correctly position the omnibox.
 class BubblePositionerMac : public BubblePositioner {
  public:
   BubblePositionerMac(ToolbarController* controller)
@@ skipping 281 matching lines @@
   // Make location bar not editable when in a pop-up.
   [locationBar_ setEditable:toolbar];
 }
 
 - (NSView*)view {
   if (hasToolbar_)
     return [super view];
   return locationBar_;
 }
 
+// (Private) Returns the backdrop to the toolbar.
 - (BackgroundGradientView*)backgroundGradientView {
+  // We really do mean |[super view]|; see our override of |-view|.
+  DCHECK([[super view] isKindOfClass:[BackgroundGradientView class]]);
   return (BackgroundGradientView*)[super view];
 }
 
 - (id)customFieldEditorForObject:(id)obj {
   if (obj == locationBar_) {
     // Lazilly construct Field editor, Cocoa UI code always runs on the
     // same thread, so there shoudn't be a race condition here.
     if (autocompleteTextFieldEditor_.get() == nil) {
       autocompleteTextFieldEditor_.reset(
           [[AutocompleteTextFieldEditor alloc] init]);
@@ skipping 141 matching lines @@
   NSRect locationFrame = [locationBar_ frame];
   locationFrame.size.width += dX;
   [locationBar_ setFrame:locationFrame];
 }
 
 - (NSRect)starButtonInWindowCoordinates {
   return [[[starButton_ window] contentView] convertRect:[starButton_ bounds]
                                                 fromView:starButton_];
 }
 
-- (void)setShouldBeCompressed:(BOOL)compressed {
-  CGFloat newToolbarHeight = kBaseToolbarHeight;
-  if (compressed)
-    newToolbarHeight -= kBookmarkBarOverlap;
+- (void)setHeightCompression:(CGFloat)compressByHeight {
+  // Resize.
+  CGFloat newToolbarHeight = kBaseToolbarHeight - compressByHeight;
+  [resizeDelegate_ resizeView:[self view] newHeight:newToolbarHeight];
+}
 
-  [resizeDelegate_ resizeView:[self view] newHeight:newToolbarHeight];
+- (void)setShowsDivider:(BOOL)showDivider {
+  [[self backgroundGradientView] setShowsDivider:showDivider];
 }
 
 - (NSString*)view:(NSView*)view
  stringForToolTip:(NSToolTipTag)tag
             point:(NSPoint)point
          userData:(void*)userData {
   DCHECK(view == goButton_);
 
   // Following chrome/browser/views/go_button.cc: GoButton::GetTooltipText()
 
@@ skipping 57 matching lines @@
 
   NSRect r = NSMakeRect(minX, NSMinY(locationFrame), maxX - minX,
                         NSHeight(locationFrame));
   gfx::Rect stack_bounds(
       NSRectToCGRect([[self view] convertRect:r toView:nil]));
   // Inset the bounds to just inside the visible edges (see comment above).
   stack_bounds.Inset(kLocationStackEdgeWidth, 0);
   return stack_bounds;
 }
 @end