Removes our homespun grow box and replaces it with the...

chrome/browser/cocoa/browser_window_controller.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.
 
 #include "base/mac_util.h"
 #include "base/scoped_nsdisable_screen_updates.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"  // IDC_*
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 18 matching lines @@
 #include "chrome/common/pref_service.h"
 
 namespace {
 
 // Size of the gradient. Empirically determined so that the gradient looks
 // like what the heuristic does when there are just a few tabs.
 const int kWindowGradientHeight = 24;
 
 }
 
+@interface NSWindow (NSPrivateApis)
+// Note: These functions are private, use -[NSObject respondsToSelector:]
+// before calling them.
+
+- (void)setAutorecalculatesContentBorderThickness:(BOOL)b
+                                          forEdge:(NSRectEdge)e;
+- (void)setContentBorderThickness:(CGFloat)b forEdge:(NSRectEdge)e;
+
+- (void)setBottomCornerRounded:(BOOL)rounded;
+
+- (NSRect)_growBoxRect;
+@end
+
+
 @interface BrowserWindowController(Private)
 
 - (void)positionToolbar;
 - (void)installIncognitoBadge;
 
 // Leopard's gradient heuristic gets confused by our tabs and makes the title
 // gradient jump when creating a tab that is less than a tab width from the
 // right side of the screen. This function disables Leopard's gradient
 // heuristic.
 - (void)fixWindowGradient;
@@ skipping 39 matching lines @@
     tabObserver_.reset(
         new TabStripModelObserverBridge(browser->tabstrip_model(), self));
     windowShim_.reset(new BrowserWindowCocoa(browser, self, [self window]));
 
     // The window is now fully realized and |-windowDidLoad:| has been
     // called. We shouldn't do much in wDL because |windowShim_| won't yet
     // be initialized (as it's called in response to |[self window]| above).
     // Retain it per the comment in the header.
     window_.reset([[self window] retain]);
 
+    // Sets the window to not have rounded corners, which prevents
+    // the resize control from being inset slightly and looking ugly.
+    if ([window_ respondsToSelector:@selector(setBottomCornerRounded:)])
+      [window_ setBottomCornerRounded:NO];
+
     // Since we don't have a standard resize control, Cocoa won't enable the
     // zoom (green) button on the titlebar for us. Grab it and enable it
     // manually. Note that when launched from XCode, the doesn't work for the
     // first window (and only the first window). There's some activation
     // wonkiness there, since XCode stays active and the menus don't switch
     // either. It always works when launched from the Finder.
     NSButton* zoomButton =
         [[self window] standardWindowButton:NSWindowZoomButton];
     [zoomButton setEnabled:YES];
 
@@ skipping 269 matching lines @@
 }
 
 - (void)setStarredState:(BOOL)isStarred {
   [toolbarController_ setStarredState:isStarred];
 }
 
 // Return the rect, in WebKit coordinates (flipped), of the window's grow box
 // in the coordinate system of the content area of the currently selected tab.
 // |windowGrowBox| needs to be in the window's coordinate system.
 - (NSRect)selectedTabGrowBoxRect {
-  return [tabStripController_ selectedTabGrowBoxRect];
+  if (![window_ respondsToSelector:@selector(_growBoxRect)])
+    return NSZeroRect;
+
+  // Before we return a rect, we need to convert it from window coordinates
+  // to tab content area coordinates and flip the coordinate system.
+  NSRect growBoxRect =
+      [[self tabContentArea] convertRect:[window_ _growBoxRect] fromView:nil];
+  growBoxRect.origin.y =
+      [[self tabContentArea] frame].size.height - growBoxRect.size.height -
+      growBoxRect.origin.y;
+  return growBoxRect;
 }
 
 // Accept tabs from a BrowserWindowController with the same Profile.
 - (BOOL)canReceiveFrom:(TabWindowController*)source {
   if (![source isKindOfClass:[BrowserWindowController class]]) {
     return NO;
   }
 
   BrowserWindowController* realSource =
       static_cast<BrowserWindowController*>(source);
@@ skipping 225 matching lines @@
 - (void)tabChangedWithContents:(TabContents*)contents
                        atIndex:(NSInteger)index
                    loadingOnly:(BOOL)loading {
   // Update titles if this is the currently selected tab.
   if (index == browser_->tabstrip_model()->selected_index())
     windowShim_->UpdateTitleBar();
 }
 
 @end
 
-
-@interface NSWindow (NSPrivateApis)
-// Note: These functions are private, use -[NSObject respondsToSelector:]
-// before calling them.
-
-- (void)setAutorecalculatesContentBorderThickness:(BOOL)b
-                                          forEdge:(NSRectEdge)e;
-- (void)setContentBorderThickness:(CGFloat)b forEdge:(NSRectEdge)e;
-@end
-
-
 @implementation BrowserWindowController (Private)
 
 // Position |toolbarView_| below the tab strip, but not as a sibling. The
 // toolbar is part of the window's contentView, mainly because we want the
 // opacity during drags to be the same as the web content.
 - (void)positionToolbar {
   NSView* contentView = [self tabContentArea];
   NSRect contentFrame = [contentView frame];
   NSView* toolbarView = [toolbarController_ view];
   NSRect toolbarFrame = [toolbarView frame];
@@ skipping 131 matching lines @@
     browser_->ExecuteCommand(command);
 }
 
 - (id)windowWillReturnFieldEditor:(NSWindow*)sender toObject:(id)obj {
   // Ask the toolbar controller if it wants to return a custom field editor
   // for the specific object.
   return [toolbarController_ customFieldEditorForObject:obj];
 }
 
 @end