Mac: fix/implement app windows (not app mode), popups, drawing; refactor code.

chrome/browser/cocoa/chrome_browser_window.mm

 // Copyright (c) 2009 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/cocoa/chrome_browser_window.h"
 
 #include "base/logging.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/browser_frame_view.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
@@ skipping 94 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 yOffset = [browserController isNormalWindow] ?
+    CGFloat yOffset = [browserController hasTabStrip] ?
         kChromeWindowButtonsWithTabStripOffsetFromTop :
         kChromeWindowButtonsWithoutTabStripOffsetFromTop;
     closeButtonFrame.origin =
         NSMakePoint(kChromeWindowButtonsOffsetFromLeft,
                     (NSHeight(frameViewBounds) -
                      NSHeight(closeButtonFrame) - yOffset));
 
     [closeButton_ setFrame:closeButtonFrame];
     [closeButton_ setTarget:self];
     [closeButton_ setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
@@ skipping 211 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