Revert 70621 - With the Mac App Store, we see that window controls are no lon...

chrome/browser/ui/cocoa/framed_browser_window.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/framed_browser_window.h"
 
 #include "base/logging.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #import "chrome/browser/ui/cocoa/browser_frame_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 100 matching lines @@
     oldButton = [self standardWindowButton:NSWindowMiniaturizeButton];
     [oldButton setHidden:YES];
     oldButton = [self standardWindowButton:NSWindowZoomButton];
     [oldButton setHidden:YES];
 
     // Create and position our new buttons.
     NSUInteger aStyle = [self styleMask];
     closeButton_ = [NSWindow standardWindowButton:NSWindowCloseButton
                                      forStyleMask:aStyle];
     NSRect closeButtonFrame = [closeButton_ frame];
-    CGFloat xOffset = [browserController hasTabStrip] ?
-        kFramedWindowButtonsWithTabStripOffsetFromLeft :
-        kFramedWindowButtonsWithoutTabStripOffsetFromLeft;
     CGFloat yOffset = [browserController hasTabStrip] ?
         kFramedWindowButtonsWithTabStripOffsetFromTop :
         kFramedWindowButtonsWithoutTabStripOffsetFromTop;
     closeButtonFrame.origin =
-        NSMakePoint(xOffset, (NSHeight(frameViewBounds) -
-                              NSHeight(closeButtonFrame) - yOffset));
+        NSMakePoint(kFramedWindowButtonsOffsetFromLeft,
+                    (NSHeight(frameViewBounds) -
+                     NSHeight(closeButtonFrame) - yOffset));
 
     [closeButton_ setFrame:closeButtonFrame];
     [closeButton_ setTarget:self];
     [closeButton_ setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
     [frameView addSubview:closeButton_];
 
     miniaturizeButton_ =
         [NSWindow standardWindowButton:NSWindowMiniaturizeButton
                           forStyleMask:aStyle];
     NSRect miniaturizeButtonFrame = [miniaturizeButton_ frame];
@@ skipping 203 matching lines @@
   // return the original (unconstrained) frame.
   id delegate = [self delegate];
   if ([delegate respondsToSelector:@selector(shouldConstrainFrameRect)] &&
       ![delegate shouldConstrainFrameRect])
     return frame;
 
   return [super constrainFrameRect:frame toScreen:screen];
 }
 
 @end