[Toolbar Mac UI] Simplify and correct omnibox pinning

chrome/browser/ui/cocoa/toolbar/toolbar_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 "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
@@ skipping 636 matching lines @@
         addObserver:self
            selector:@selector(browserActionsContainerWillAnimate:)
                name:kBrowserActionsContainerWillAnimate
              object:browserActionsContainerView_];
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(adjustBrowserActionsContainerForNewWindow:)
                name:NSWindowDidBecomeKeyNotification
              object:[[self view] window]];
   }
-  CGFloat containerWidth = [browserActionsContainerView_ isHidden] ? 0.0 :
-      NSWidth([browserActionsContainerView_ frame]);
-  if (containerWidth > 0.0)
-    [self adjustLocationSizeBy:(containerWidth * -1) animate:NO];
+  if (![browserActionsContainerView_ isHidden])
+    [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)adjustBrowserActionsContainerForNewWindow:
     (NSNotification*)notification {
   [self toolbarFrameChanged];
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidBecomeKeyNotification
               object:[[self view] window]];
 }
 
 - (void)browserActionsContainerDragged:(NSNotification*)notification {
-  CGFloat locationBarWidth = NSWidth([locationBar_ frame]);
-  locationBarAtMinSize_ = locationBarWidth <= kMinimumLocationBarWidth;
-  [self adjustLocationSizeBy:
-      [browserActionsContainerView_ resizeDeltaX] animate:NO];
+  [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification {
   [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)browserActionsContainerWillAnimate:(NSNotification*)notification {
   [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:YES];
 }
 
@@ skipping 200 matching lines @@
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (BOOL)isUnsupportedDropData:(id<NSDraggingInfo>)info {
   return drag_util::IsUnsupportedDropData(profile_, info);
 }
 
 @end