[Mac] Refactor the Fullscreen Toolbar Visibility Locks

chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm

 // Copyright 2014 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/profiles/avatar_base_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 133 matching lines @@
       [profileChooserController initMenuContentsWithView:viewMode];
     }
     return;
   }
 
   DCHECK(chrome::IsCommandEnabled(browser_, IDC_SHOW_AVATAR_MENU));
 
   NSWindowController* wc =
       [browser_->window()->GetNativeWindow() windowController];
   if ([wc isKindOfClass:[BrowserWindowController class]]) {
-    [static_cast<BrowserWindowController*>(wc) lockBarVisibilityForOwner:self
-                                                           withAnimation:NO];
+    [static_cast<BrowserWindowController*>(wc)
+        lockToolbarVisibilityForOwner:self
+                        withAnimation:NO];
   }
 
   // The new avatar bubble does not have an arrow, and it should be anchored
   // to the edge of the avatar button.
   int anchorX = NSMaxX([anchor bounds]) - kMenuXOffsetAdjust;
   NSPoint point = NSMakePoint(anchorX,
                               NSMaxY([anchor bounds]) + kMenuYOffsetAdjust);
   point = [anchor convertPoint:point toView:nil];
   point = ui::ConvertPointFromWindowToScreen([anchor window], point);
 
@@ skipping 54 matching lines @@
                    withServiceType:signin::GAIA_SERVICE_TYPE_NONE
                    fromAccessPoint:signin_metrics::AccessPoint::
                                        ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN];
 }
 
 - (void)bubbleWillClose:(NSNotification*)notif {
   NSWindowController* wc =
       [browser_->window()->GetNativeWindow() windowController];
   if ([wc isKindOfClass:[BrowserWindowController class]]) {
     [static_cast<BrowserWindowController*>(wc)
-        releaseBarVisibilityForOwner:self
-                       withAnimation:YES];
+        releaseToolbarVisibilityForOwner:self
+                           withAnimation:YES];
   }
   menuController_ = nil;
 }
 
 - (void)updateAvatarButtonAndLayoutParent:(BOOL)layoutParent {
   NOTREACHED();
 }
 
 - (void)setErrorStatus:(BOOL)hasError {
 }
 
 - (BaseBubbleController*)menuController {
   return menuController_;
 }
 
 @end