[Toolbar Mac UI] Simplify and correct omnibox pinning

chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm

 // 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 "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
@@ skipping 102 matching lines @@
                     object:self];
 }
 
 - (void)mouseDown:(NSEvent*)theEvent {
   initialDragPoint_ = [self convertPoint:[theEvent locationInWindow]
                                 fromView:nil];
   if (!resizable_ ||
       !NSMouseInRect(initialDragPoint_, grippyRect_, [self isFlipped]))
     return;
 
-  lastXPos_ = [self frame].origin.x;
   userIsResizing_ = YES;
 
   [[self appropriateCursorForGrippy] push];
   // Disable cursor rects so that the Omnibox and other UI elements don't push
   // cursors while the user is dragging. The cursor should be grippy until
   // the |-mouseUp:| message is received.
   [[self window] disableCursorRects];
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kBrowserActionGrippyDragStartedNotification
@@ skipping 39 matching lines @@
 
   grippyPinned_ = NSWidth(containerFrame) >= maxAllowedWidth;
   containerFrame.origin.x += dX;
 
   [self setFrame:containerFrame];
   [self setNeedsDisplay:YES];
 
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kBrowserActionGrippyDraggingNotification
                     object:self];
-
-  lastXPos_ += dX;
 }
 
 - (ViewID)viewID {
   return VIEW_ID_BROWSER_ACTION_TOOLBAR;
 }
 
 #pragma mark -
 #pragma mark Public Methods
 
 - (void)resizeToWidth:(CGFloat)width animate:(BOOL)animate {
   width = std::max(width, kMinimumContainerWidth);
   NSRect frame = [self frame];
 
   CGFloat maxAllowedWidth = [self maxAllowedWidth];
   width = std::min(maxAllowedWidth, width);
 
-  lastXPos_ = frame.origin.x;
   CGFloat dX = frame.size.width - width;
   frame.size.width = width;
   NSRect newFrame = NSOffsetRect(frame, dX, 0);
 
   grippyPinned_ = width == maxAllowedWidth;
 
   [self stopAnimation];
 
   if (animate) {
     NSDictionary* animationDictionary = @{
       NSViewAnimationTargetKey : self,
       NSViewAnimationStartFrameKey : [NSValue valueWithRect:[self frame]],
       NSViewAnimationEndFrameKey : [NSValue valueWithRect:newFrame]
     };
     [resizeAnimation_ setViewAnimations:@[ animationDictionary ]];
     [resizeAnimation_ startAnimation];
 
     [[NSNotificationCenter defaultCenter]
         postNotificationName:kBrowserActionsContainerWillAnimate
                       object:self];
   } else {
     [self setFrame:newFrame];
     [self setNeedsDisplay:YES];
   }
 }
 
-- (CGFloat)resizeDeltaX {
-  return [self frame].origin.x - lastXPos_;
-}
-
 - (NSRect)animationEndFrame {
   if ([resizeAnimation_ isAnimating]) {
     NSRect endFrame = [[[[resizeAnimation_ viewAnimations] objectAtIndex:0]
         valueForKey:NSViewAnimationEndFrameKey] rectValue];
     return endFrame;
   } else {
     return [self frame];
   }
 }
 
@@ skipping 23 matching lines @@
     retVal = [NSCursor resizeLeftRightCursor];
   }
   return retVal;
 }
 
 - (CGFloat)maxAllowedWidth {
   return delegate_ ? delegate_->GetMaxAllowedWidth() : CGFLOAT_MAX;
 }
 
 @end