Fix for "Mouseovers follow the cursor even when there's a find bar in the way"

chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
@@ skipping 31 matching lines @@
                duration:(float)duration;
 
 // Returns the horizontal position the FindBar should use in order to avoid
 // overlapping with the current find result, if there's one.
 - (float)findBarHorizontalPosition;
 
 // Adjusts the horizontal position if necessary to avoid overlapping with the
 // current find result.
 - (void)moveFindBarIfNecessary:(BOOL)animate;
 
+// Sets the hidden status of the FindBarView and its superview.
+- (void)setFindBarViewHidden:(BOOL)hidden;
+
 // Optionally stops the current search, puts |text| into the find bar, and
 // enables the buttons, but doesn't start a new search for |text|.
 - (void)prepopulateText:(NSString*)text stopSearch:(BOOL)stopSearch;
 @end
 
 @implementation FindBarCocoaController
 
 - (id)init {
   if ((self = [super initWithNibName:@"FindBar"
                               bundle:base::mac::MainAppBundle()])) {
@@ skipping 308 matching lines @@
   if (animation == showHideAnimation_.get()) {
     [showHideAnimation_.release() autorelease];
   } else if (animation == moveAnimation_.get()) {
     [moveAnimation_.release() autorelease];
   } else {
     NOTREACHED();
   }
 
   // If the find bar is not visible, make it actually hidden, so it'll no longer
   // respond to key events.
-  [findBarView_ setHidden:![self isFindBarVisible]];
+  [self setFindBarViewHidden:![self isFindBarVisible]];
 }
 
 - (gfx::Point)findBarWindowPosition {
   gfx::Rect view_rect(NSRectToCGRect([[self view] frame]));
   // Convert Cocoa coordinates (Y growing up) to Y growing down.
   // Offset from |maxY_|, which represents the content view's top, instead
   // of from the superview, which represents the whole browser window.
   view_rect.set_y(maxY_ - view_rect.bottom());
   return view_rect.origin();
 }
@@ skipping 30 matching lines @@
                 animate:(BOOL)animate
                duration:(float)duration {
   // Save the current frame.
   NSRect startFrame = [findBarView_ frame];
 
   // Stop any existing animations.
   [showHideAnimation_ stopAnimation];
 
   if (!animate) {
     [findBarView_ setFrame:endFrame];
-    [findBarView_ setHidden:![self isFindBarVisible]];
+    [self setFindBarViewHidden:![self isFindBarVisible]];
     showHideAnimation_.reset(nil);
     return;
   }
 
   // If animating, ensure that the find bar is not hidden. Hidden status will be
   // updated at the end of the animation.
-  [findBarView_ setHidden:NO];
+  [self setFindBarViewHidden:NO];
 
   // Reset the frame to what was saved above.
   [findBarView_ setFrame:startFrame];
 
   showHideAnimation_.reset([self createAnimationForView:findBarView_
                                                 toFrame:endFrame
                                                duration:duration]);
 }
 
 - (float)findBarHorizontalPosition {
@@ skipping 52 matching lines @@
     frame.origin.x = x;
     moveAnimation_.reset([self createAnimationForView:view
                                               toFrame:frame
                                              duration:kFindBarMoveDuration]);
   } else {
     frame.origin.x = x;
     [view setFrame:frame];
   }
 }
 
+- (void)setFindBarViewHidden:(BOOL)hidden {
+  // Set the hidden status of both the findBarView_ and the NSView
+  // of this controller (superview of findBarView_).
+  [findBarView_ setHidden:hidden];
+  [[self view] setHidden:hidden];
+}
+
 - (void)prepopulateText:(NSString*)text stopSearch:(BOOL)stopSearch{
   [self setFindText:text];
 
   // End the find session, hide the "x of y" text and disable the
   // buttons, but do not close the find bar or raise the window here.
   if (stopSearch && findBarBridge_) {
     TabContentsWrapper* contents =
         findBarBridge_->GetFindBarController()->tab_contents();
     if (contents) {
       FindTabHelper* find_tab_helper = contents->find_tab_helper();
       find_tab_helper->StopFinding(FindBarController::kClearSelection);
       findBarBridge_->ClearResults(find_tab_helper->find_result());
     }
   }
 
   // Has to happen after |ClearResults()| above.
   BOOL buttonsEnabled = [text length] > 0 ? YES : NO;
   [previousButton_ setEnabled:buttonsEnabled];
   [nextButton_ setEnabled:buttonsEnabled];
 }
 
 @end