[Mac] Implement LocationBarViewMac::UpdateLocationBarVisibility()

chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm

 // Copyright (c) 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/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 52 matching lines @@
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
 
+// Duration of the toolbar animation.
+const NSTimeInterval kToolBarAnimationDuration = 0.12;
+
 // Height of the toolbar in pixels when the bookmark bar is closed.
 const CGFloat kBaseToolbarHeightNormal = 35.0;
 
 // The padding above the toolbar elements. This is calculated from the values
 // in Toolbar.xib: the height of the toolbar (35) minus the height of the child
 // elements (29) minus the y-origin of the elements (4).
 const CGFloat kToolbarElementTopPadding = 2.0;
 
 // The minimum width of the location bar in pixels.
 const CGFloat kMinimumLocationBarWidth = 100.0;
@@ skipping 39 matching lines @@
 
 }  // namespace
 
 @interface ToolbarController()
 @property(assign, nonatomic) Browser* browser;
 - (void)cleanUp;
 - (void)addAccessibilityDescriptions;
 - (void)initCommandStatus:(CommandUpdater*)commands;
 - (void)prefChanged:(const std::string&)prefName;
 - (BackgroundGradientView*)backgroundGradientView;
+- (AnimatableView*)animatableView;
 - (void)toolbarFrameChanged;
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate;
 - (void)maintainMinimumLocationBarWidth;
 - (void)adjustBrowserActionsContainerForNewWindow:(NSNotification*)notification;
 - (void)browserActionsContainerDragged:(NSNotification*)notification;
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification;
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification;
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate;
 - (void)updateWrenchButtonSeverity:(WrenchIconPainter::Severity)severity
                            animate:(BOOL)animate;
@@ skipping 448 matching lines @@
   // Make location bar not editable when in a pop-up.
   locationBarView_->SetEditable(toolbar);
 }
 
 - (NSView*)view {
   if (hasToolbar_)
     return [super view];
   return locationBar_;
 }
 
-// (Private) Returns the backdrop to the toolbar.
+// (Private) Returns the backdrop to the toolbar as a BackgroundGradientView.
 - (BackgroundGradientView*)backgroundGradientView {
   // We really do mean |[super view]|; see our override of |-view|.
   DCHECK([[super view] isKindOfClass:[BackgroundGradientView class]]);
   return (BackgroundGradientView*)[super view];
 }
 
+// (Private) Returns the backdrop to the toolbar as an AnimatableView.
+- (AnimatableView*)animatableView{
+  // We really do mean |[super view]|; see our override of |-view|.
+  DCHECK([[super view] isKindOfClass:[AnimatableView class]]);
+  return (AnimatableView*)[super view];

[tapted, 2015/10/12 23:56:43]

use base::mac::ObjCCastStrict<AnimatableView>([super view]); (and remove the
DCHECK)

(the usage in backgroundGradientView above is outdated..)

[dominickn, 2015/10/15 06:22:28]

Done.

+}
+
 - (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]);
     }
 
     // This needs to be called every time, otherwise notifications
@@ skipping 102 matching lines @@
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(adjustBrowserActionsContainerForNewWindow:)
                name:NSWindowDidBecomeKeyNotification
              object:[[self view] window]];
   }
   if (![browserActionsContainerView_ isHidden])
     [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
+- (void)updateVisibility:(BOOL)visible withAnimation:(BOOL)animate {
+  // This method is only called in a hosted app, when the bookmark bar is never
+  // visible. Hence, the height will always be kBaseToolbarHeightNormal.
+  [self setHasToolbar:hasToolbar_ hasLocationBar:visible];
+
+  AnimatableView* view = [self animatableView];
+  CGFloat newHeight = (visible ? kBaseToolbarHeightNormal : 0);

[tapted, 2015/10/12 23:56:43]

parens (..) not required

[dominickn, 2015/10/15 06:22:28]

Done.

+  if (animate) {
+    [view animateToNewHeight:newHeight
+                    duration:kToolBarAnimationDuration];
+  } else {
+    [view setHeight:newHeight];

[tapted, 2015/10/12 23:56:43]

Shouldn't setting the height to zero be sufficient to hide it? (why is
LayoutParams.toolbarHidden needed?)

[dominickn, 2015/10/15 06:22:28]

That was previously necessary because of the lack of setting the resizeDelegate.
Thanks!

+  }
+}
+
 - (void)adjustBrowserActionsContainerForNewWindow:
     (NSNotification*)notification {
   [self toolbarFrameChanged];
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidBecomeKeyNotification
               object:[[self view] window]];
 }
 
 - (void)browserActionsContainerDragged:(NSNotification*)notification {
@@ skipping 211 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end