[Mac] Fixes regression where the I-Beam was not being shown when hovering ove...

chrome/browser/cocoa/autocomplete_text_field.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 "chrome/browser/cocoa/autocomplete_text_field.h"
 
 #include "base/logging.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
@@ skipping 177 matching lines @@
 - (NSUndoManager*)undoManagerForTextView:(NSTextView*)textView {
   if (!undoManager_.get())
     undoManager_.reset([[NSUndoManager alloc] init]);
   return undoManager_.get();
 }
 
 - (void)clearUndoChain {
   [undoManager_ removeAllActions];
 }
 
-// Any image within the field (Page Actions or the security icon) should have
-// the arrow cursor shown instead of the I-beam.
+// Show the I-beam cursor unless the mouse is over an image within the field
+// (Page Actions or the security icon) in which case show the arrow cursor.
 - (void)resetCursorRects {
+  NSRect fieldBounds = [self bounds];
+  [self addCursorRect:fieldBounds cursor:[NSCursor IBeamCursor]];
+
   AutocompleteTextFieldCell* cell = [self autocompleteTextFieldCell];
-  NSRect iconRect = [cell securityImageFrameForFrame:[self bounds]];
+  NSRect iconRect = [cell securityImageFrameForFrame:fieldBounds];
   [self addCursorRect:iconRect cursor:[NSCursor arrowCursor]];
 
   const size_t pageActionCount = [cell pageActionCount];
   for (size_t i = 0; i < pageActionCount; ++i) {
-    iconRect = [cell pageActionFrameForIndex:i inFrame:[self bounds]];
+    iconRect = [cell pageActionFrameForIndex:i inFrame:fieldBounds];
     [self addCursorRect:iconRect cursor:[NSCursor arrowCursor]];
   }
 }
 
 - (void)updateCursorAndToolTipRects {
   // This will force |resetCursorRects| to be called, as it is not to be called
   // directly.
   [[self window] invalidateCursorRectsForView:self];
 
   // |removeAllToolTips| only removes those set on the current NSView, not any
@@ skipping 102 matching lines @@
 - (void)draggingExited:(id<NSDraggingInfo>)sender {
   return [dropHandler_ draggingExited:sender];
 }
 
 // (URLDropTarget protocol)
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
   return [dropHandler_ performDragOperation:sender];
 }
 
 @end