| Index: chrome/browser/ui/cocoa/browser_window_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| index 866ad49d5d10054f7f467351e6ddf2c5c367a0a1..7526dfab7fc0b4cdd8e14626161cb70dec198e1c 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| @@ -1984,24 +1984,19 @@ willAnimateFromState:(BookmarkBar::State)oldState
|
| return [barVisibilityLocks_ containsObject:owner];
|
| }
|
|
|
| -- (void)lockBarVisibilityForOwner:(id)owner
|
| - withAnimation:(BOOL)animate
|
| - delay:(BOOL)delay {
|
| +- (void)lockBarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate {
|
| if (![self isBarVisibilityLockedForOwner:owner]) {
|
| [barVisibilityLocks_ addObject:owner];
|
|
|
| // If enabled, show the overlay if necessary (and if the fullscreen
|
| // toolbar is hidden).
|
| if (barVisibilityUpdatesEnabled_) {
|
| - [fullscreenToolbarController_ ensureOverlayShownWithAnimation:animate
|
| - delay:delay];
|
| + [fullscreenToolbarController_ ensureOverlayShownWithAnimation:animate];
|
| }
|
| }
|
| }
|
|
|
| -- (void)releaseBarVisibilityForOwner:(id)owner
|
| - withAnimation:(BOOL)animate
|
| - delay:(BOOL)delay {
|
| +- (void)releaseBarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate {
|
| if ([self isBarVisibilityLockedForOwner:owner]) {
|
| [barVisibilityLocks_ removeObject:owner];
|
|
|
| @@ -2009,8 +2004,7 @@ willAnimateFromState:(BookmarkBar::State)oldState
|
| // toolbar is hidden).
|
| if (barVisibilityUpdatesEnabled_ &&
|
| ![barVisibilityLocks_ count]) {
|
| - [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animate
|
| - delay:delay];
|
| + [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animate];
|
| }
|
| }
|
| }
|
|
|