Mac: trivial clean up of tab strip layout code + unseeable layout fix.

chrome/browser/ui/cocoa/tab_strip_controller.mm

 // Copyright (c) 2010 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/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <limits>
 #include <string>
@@ skipping 773 matching lines @@
     // Divide up the space between the non-mini-tabs.
     nonMiniTabWidth = availableSpaceForNonMini / numberOfOpenNonMiniTabs;
 
     // Clamp the width between the max and min.
     nonMiniTabWidth = MAX(MIN(nonMiniTabWidth, kMaxTabWidth), kMinTabWidth);
   }
 
   BOOL visible = [[tabStripView_ window] isVisible];
 
   CGFloat offset = [self indentForControls];
-  NSUInteger i = 0;
   bool hasPlaceholderGap = false;
   for (TabController* tab in tabArray_.get()) {
     // Ignore a tab that is going through a close animation.
     if ([closingControllers_ containsObject:tab])
       continue;
 
     BOOL isPlaceholder = [[tab view] isEqual:placeholderTab_];
     NSRect tabFrame = [[tab view] frame];
     tabFrame.size.height = [[self class] defaultTabHeight] + 1;
     if (verticalLayout_) {
       tabFrame.origin.y = availableSpace - tabFrame.size.height - offset;
       tabFrame.origin.x = 0;
     } else {
       tabFrame.origin.y = 0;
       tabFrame.origin.x = offset;
     }
     // If the tab is hidden, we consider it a new tab. We make it visible
     // and animate it in.
     BOOL newTab = [[tab view] isHidden];
-    if (newTab) {
+    if (newTab)
       [[tab view] setHidden:NO];
-    }
 
     if (isPlaceholder) {
       // Move the current tab to the correct location instantly.
       // We need a duration or else it doesn't cancel an inflight animation.
       ScopedNSAnimationContextGroup localAnimationGroup(animate);
       localAnimationGroup.SetCurrentContextShortestDuration();
       if (verticalLayout_)
         tabFrame.origin.y = availableSpace - tabFrame.size.height - offset;
       else
         tabFrame.origin.x = placeholderFrame_.origin.x;
@@ skipping 62 matching lines @@
     }
 
     enclosingRect = NSUnionRect(tabFrame, enclosingRect);
 
     if (verticalLayout_) {
       offset += NSHeight(tabFrame);
     } else {
       offset += NSWidth(tabFrame);
       offset -= kTabOverlap;
     }
-    i++;
   }
 
   // Hide the new tab button if we're explicitly told to. It may already
   // be hidden, doing it again doesn't hurt. Otherwise position it
   // appropriately, showing it if necessary.
   if (forceNewTabButtonHidden_) {
     [newTabButton_ setHidden:YES];
   } else {
     NSRect newTabNewFrame = [newTabButton_ frame];
     // We've already ensured there's enough space for the new tab button
     // so we don't have to check it against the available space. We do need
     // to make sure we put it after any placeholder.
-    newTabNewFrame.origin = NSMakePoint(offset, 0);
-    newTabNewFrame.origin.x = MAX(newTabNewFrame.origin.x,
-                                  NSMaxX(placeholderFrame_)) +
-                                      kNewTabButtonOffset;
+    newTabNewFrame.origin =
+        NSMakePoint(MAX(offset, NSMaxX(placeholderFrame_) - kTabOverlap) +

[Nico, 2010/12/30 03:56:06]

As you would say, "I hate this formatting". Maybe introduce a variable for some
subexpression for x (maybe for |NSMaxX(placeholderFrame_) - kTabOverlap| or
|MAX(offset, NSMaxX(placeholderFrame_) - kTabOverlap)|, and then have one line
for x and one for y.

[viettrungluu, 2010/12/30 05:07:21]

Done. I hated the formatting too. Ironically, introducing a variable allowed me
to fit it on only two lines (sensibly).

+            kNewTabButtonOffset, 0);
     if ([tabContentsArray_ count])
       [newTabButton_ setHidden:NO];
 
     if (!NSEqualRects(newTabTargetFrame_, newTabNewFrame)) {
       // Set the new tab button image correctly based on where the cursor is.
       NSWindow* window = [tabStripView_ window];
       NSPoint currentMouse = [window mouseLocationOutsideOfEventStream];
       currentMouse = [tabStripView_ convertPoint:currentMouse fromView:nil];
 
       BOOL shouldShowHover = [newTabButton_ pointIsOverButton:currentMouse];
@@ skipping 970 matching lines @@
   NSInteger index = [self indexFromModelIndex:modelIndex];
   BrowserWindowController* controller =
       (BrowserWindowController*)[[switchView_ window] windowController];
   DCHECK(index >= 0);
   if (index >= 0) {
     [controller setTab:[self viewAtIndex:index] isDraggable:YES];
   }
 }
 
 @end