Rewrites the Mac view resizing logic to have the BrowserWindowController...

chrome/browser/cocoa/find_bar_cocoa_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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "grit/generated_resources.h"
@@ skipping 34 matching lines @@
         false, false);
 }
 
 - (IBAction)nextResult:(id)sender {
   if (findBarBridge_)
     findBarBridge_->GetFindBarController()->tab_contents()->StartFinding(
         base::SysNSStringToUTF16([findText_ stringValue]),
         true, false);
 }
 
-// Positions the find bar view in the correct location based on the
-// current state of the window.  Currently only the visibility of the
-// bookmark bar can affect the find bar's position.
-- (void)positionFindBarView:(NSView*)contentArea {
+// Positions the find bar view in the correct location based on the current
+// state of the window.  The findbar is always positioned one pixel above the
+// infobar container.  Note that we are using the infobar container location as
+// a proxy for the toolbar location, but we cannot position based on the toolbar
+// because the toolbar is not always present (for example in fullscreen
+// windows).
+- (void)positionFindBarView:(NSView*)infoBarContainerView {
   static const int kRightEdgeOffset = 25;
   NSView* findBarView = [self view];
   int findBarHeight = NSHeight([findBarView frame]);
   int findBarWidth = NSWidth([findBarView frame]);
 
-  // Start by computing the upper right corner of the tab content
-  // area, then move left by a constant offset and up one pixel.  This
-  // gives us the upper right corner of our bounding box.  We move up
-  // one pixel to overlap with the toolbar area, which allows us to
-  // cover up the toolbar's border.
-  NSRect windowRect = [contentArea frame];
+  // Start by computing the upper right corner of the infobar container, then
+  // move left by a constant offset and up one pixel.  This gives us the upper
+  // right corner of our bounding box.  We move up one pixel to overlap with the
+  // toolbar area, which allows us to cover up the toolbar's border, if present.
+  NSRect windowRect = [infoBarContainerView frame];
   int max_x = NSMaxX(windowRect) - kRightEdgeOffset;
   int max_y = NSMaxY(windowRect) + 1;
 
   NSRect findRect = NSMakeRect(max_x - findBarWidth, max_y - findBarHeight,
                                findBarWidth, findBarHeight);
   [findBarView setFrame:findRect];
 }
 
 // NSControl delegate method.
 - (void)controlTextDidChange:(NSNotification *)aNotification {
@@ skipping 100 matching lines @@
 
   // TODO(rohitrao): If the search string is too long, then it will overlap with
   // the results label.  Fix.
 }
 
 - (BOOL)isFindBarVisible {
   return [[self view] isHidden] ? NO : YES;
 }
 
 @end