Merge 143021 - Fix wobbling of find bar.

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

 // Copyright (c) 2012 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/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 406 matching lines @@
                                    toFrame:(NSRect)endFrame
                                   duration:(float)duration {
   NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys:
       view, NSViewAnimationTargetKey,
       [NSValue valueWithRect:endFrame], NSViewAnimationEndFrameKey, nil];
 
   NSViewAnimation* animation =
       [[NSViewAnimation alloc]
         initWithViewAnimations:[NSArray arrayWithObjects:dict, nil]];
   [animation gtm_setDuration:duration
-                           eventMask:NSLeftMouseUpMask];
+                   eventMask:NSLeftMouseUpMask];
   [animation setDelegate:self];
   [animation startAnimation];
   return animation;
 }
 
 - (void)setFindBarFrame:(NSRect)endFrame
                 animate:(BOOL)animate
                duration:(float)duration {
   // Save the current frame.
   NSRect startFrame = [findBarView_ frame];
@@ skipping 62 matching lines @@
 }
 
 - (void)moveFindBarIfNecessary:(BOOL)animate {
   // Don't animate during tests.
   if (FindBarBridge::disable_animations_during_testing_)
     animate = NO;
 
   NSView* view = [self view];
   NSRect frame = [view frame];
   float x = [self findBarHorizontalPosition];
+  if (frame.origin.x == x)
+    return;
 
   if (animate) {
     [moveAnimation_ stopAnimation];
     // Restore to the position before the animation was stopped.
     [view setFrame:frame];
     frame.origin.x = x;
     moveAnimation_.reset([self createAnimationForView:view
                                               toFrame:frame
                                              duration:kFindBarMoveDuration]);
   } else {
@@ skipping 17 matching lines @@
     }
   }
 
   // Has to happen after |ClearResults()| above.
   BOOL buttonsEnabled = [text length] > 0 ? YES : NO;
   [previousButton_ setEnabled:buttonsEnabled];
   [nextButton_ setEnabled:buttonsEnabled];
 }
 
 @end