[Mac] Refactor the Fullscreen Toolbar Visibility Locks

chrome/browser/ui/cocoa/bookmarks/bookmark_button.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/bookmarks/bookmark_button.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ skipping 179 matching lines @@
   // the stack.
   [self retain];
 
   // Lock bar visibility, forcing the overlay to stay visible if we are in
   // fullscreen mode.
   if ([[self delegate] dragShouldLockBarVisibility]) {
     DCHECK(!visibilityDelegate_);
     NSWindow* window = [[self delegate] browserWindow];
     visibilityDelegate_ =
         [BrowserWindowController browserWindowControllerForWindow:window];
-    [visibilityDelegate_ lockBarVisibilityForOwner:self withAnimation:NO];
+    [visibilityDelegate_ lockToolbarVisibilityForOwner:self withAnimation:NO];
   }
   const BookmarkNode* node = [self bookmarkNode];
   const BookmarkNode* parent = node->parent();
   if (parent && parent->type() == BookmarkNode::FOLDER) {
     content::RecordAction(UserMetricsAction("BookmarkBarFolder_DragStart"));
   } else {
     content::RecordAction(UserMetricsAction("BookmarkBar_DragStart"));
   }
 
   dragMouseOffset_ = [self convertPoint:[event locationInWindow] fromView:nil];
@@ skipping 38 matching lines @@
     operation |= NSDragOperationDelete;
 
   return operation;
 }
 
 // Overridden to release bar visibility.
 - (DraggableButtonResult)endDrag {
   gDraggedButton = nil;
 
   // visibilityDelegate_ can be nil if we're detached, and that's fine.
-  [visibilityDelegate_ releaseBarVisibilityForOwner:self withAnimation:YES];
+  [visibilityDelegate_ releaseToolbarVisibilityForOwner:self withAnimation:YES];
   visibilityDelegate_ = nil;
 
   return kDraggableButtonImplUseBase;
 }
 
 - (void)draggingSession:(NSDraggingSession*)session
            endedAtPoint:(NSPoint)aPoint
               operation:(NSDragOperation)operation {
   gDraggedButton = nil;
   // Inform delegate of drag source that we're finished dragging,
@@ skipping 254 matching lines @@
   [[cell clipPathForFrame:bounds inView:self] setClip];
   [cell drawWithFrame:bounds inView:self];
 
   CGContextEndTransparencyLayer(cgContext);
   [image unlockFocus];
 
   return image.autorelease();
 }
 
 @end