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

chrome/browser/cocoa/chrome_browser_window_unittest.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 <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #include "chrome/app/chrome_dll_resource.h"
 #import "chrome/browser/cocoa/chrome_browser_window.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
@@ skipping 102 matching lines @@
   NSRect miniaturizeFrame = [miniaturizeControl frame];
   EXPECT_EQ(NSMaxY(miniaturizeFrame),
             NSMaxY(windowBounds) -
             kChromeWindowButtonsWithoutTabStripOffsetFromTop);
   EXPECT_EQ(NSMinX(miniaturizeFrame),
             NSMaxX(closeBoxFrame) + kChromeWindowButtonsInterButtonSpacing);
 
   // Then with a tabstrip.
   id controller = [OCMockObject mockForClass:[BrowserWindowController class]];
   BOOL yes = YES;
+  BOOL no = NO;
   [[[controller stub] andReturnValue:OCMOCK_VALUE(yes)]
    isKindOfClass:[BrowserWindowController class]];
+  [[[controller expect] andReturnValue:OCMOCK_VALUE(yes)] hasTabStrip];
+  [[[controller expect] andReturnValue:OCMOCK_VALUE(no)] hasTitleBar];
   [[[controller expect] andReturnValue:OCMOCK_VALUE(yes)] isNormalWindow];
   [window_ setWindowController:controller];
 
   closeBoxCell = [window_ accessibilityAttributeValue:
                   NSAccessibilityCloseButtonAttribute];
   closeBoxControl = [closeBoxCell controlView];
   EXPECT_TRUE(closeBoxControl);
   closeBoxFrame = [closeBoxControl frame];
   windowBounds = [window_ frame];
   windowBounds.origin = NSZeroPoint;
@@ skipping 30 matching lines @@
     NSRect rect = [area rect];
     foundArea = NSPointInRect(point, rect);
     if (foundArea) {
       EXPECT_TRUE([[area owner] isEqual:frameView]);
       break;
     }
   }
   EXPECT_TRUE(foundArea);
 }