mac: Refactor tab strip layout logic.

chrome/browser/ui/cocoa/tabs/tab_strip_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/tabs/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 2184 matching lines @@
   int modelIndex = tabStripModel_->active_index();
   if (modelIndex < 0)
     return nil;
   NSInteger index = [self indexFromModelIndex:modelIndex];
   if (index < 0 ||
       index >= (NSInteger)[tabContentsArray_ count])
     return nil;
   return [tabContentsArray_ objectAtIndex:index];
 }
 
-- (void)addWindowControls {
-  if (!fullscreenWindowControls_) {
+- (void)addCustomWindowControls {
+  if (!customWindowControls_) {
     // Make the container view.
     CGFloat height = NSHeight([tabStripView_ frame]);
     NSRect frame = NSMakeRect(0, 0, [self leftIndentForControls], height);
-    fullscreenWindowControls_.reset([[NSView alloc] initWithFrame:frame]);
-    [fullscreenWindowControls_
+    customWindowControls_.reset([[NSView alloc] initWithFrame:frame]);
+    [customWindowControls_
         setAutoresizingMask:NSViewMaxXMargin | NSViewHeightSizable];
 
     // Add the traffic light buttons. The horizontal layout was determined by
     // manual inspection on Yosemite.
     CGFloat closeButtonX = 11;
     CGFloat miniButtonX = 31;
     CGFloat zoomButtonX = 51;
 
     NSUInteger styleMask = [[tabStripView_ window] styleMask];
     NSButton* closeButton = [NSWindow standardWindowButton:NSWindowCloseButton
                                               forStyleMask:styleMask];
 
     // Vertically center the buttons in the tab strip.
     CGFloat buttonY = floor((height - NSHeight([closeButton bounds])) / 2);
     [closeButton setFrameOrigin:NSMakePoint(closeButtonX, buttonY)];
-    [fullscreenWindowControls_ addSubview:closeButton];
+    [customWindowControls_ addSubview:closeButton];
 
     NSButton* miniaturizeButton =
         [NSWindow standardWindowButton:NSWindowMiniaturizeButton
                           forStyleMask:styleMask];
     [miniaturizeButton setFrameOrigin:NSMakePoint(miniButtonX, buttonY)];
     [miniaturizeButton setEnabled:NO];
-    [fullscreenWindowControls_ addSubview:miniaturizeButton];
+    [customWindowControls_ addSubview:miniaturizeButton];
 
     NSButton* zoomButton =
         [NSWindow standardWindowButton:NSWindowZoomButton
                           forStyleMask:styleMask];
-    [fullscreenWindowControls_ addSubview:zoomButton];
+    [customWindowControls_ addSubview:zoomButton];
     [zoomButton setFrameOrigin:NSMakePoint(zoomButtonX, buttonY)];
   }
 
-  if (![permanentSubviews_ containsObject:fullscreenWindowControls_]) {
-    [self addSubviewToPermanentList:fullscreenWindowControls_];
+  if (![permanentSubviews_ containsObject:customWindowControls_]) {
+    [self addSubviewToPermanentList:customWindowControls_];
     [self regenerateSubviewList];
   }
 }
 
-- (void)removeWindowControls {
-  if (fullscreenWindowControls_)
-    [permanentSubviews_ removeObject:fullscreenWindowControls_];
+- (void)removeCustomWindowControls {
+  if (customWindowControls_)
+    [permanentSubviews_ removeObject:customWindowControls_];
   [self regenerateSubviewList];
 }
 
 - (void)themeDidChangeNotification:(NSNotification*)notification {
   [self setNewTabImages];
 }
 
 - (void)setNewTabImages {
   ThemeService *theme =
       static_cast<ThemeService*>([[tabStripView_ window] themeProvider]);
@@ skipping 47 matching lines @@
 }
 
 NSRect GetSheetParentBoundsForParentView(NSView* view) {
   // If the devtools view is open, it shrinks the size of the WebContents, so go
   // up the hierarchy to the devtools container view to avoid that. Note that
   // the devtools view is always in the hierarchy even if it is not open or it
   // is detached.
   NSView* devtools_view = [[[view superview] superview] superview];
   return [devtools_view convertRect:[devtools_view bounds] toView:nil];
 }