[Mac] Re-enable decoration tooltips in omnibox.

chrome/browser/cocoa/location_bar/autocomplete_text_field.mm

 // Copyright (c) 2010 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/location_bar/autocomplete_text_field.h"
 
 #include "base/logging.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.h"
@@ skipping 202 matching lines @@
 
   AutocompleteTextFieldCell* cell = [self cell];
   for (AutocompleteTextFieldIcon* icon in [cell layedOutIcons:fieldBounds])
     [self addCursorRect:[icon rect] cursor:[NSCursor arrowCursor]];
 
   // TODO(shess): This needs to traverse the LocationBarDecorations
   // and put up a cursor for them, too.  Except for the keyword-search
   // stuff?  Sigh.
 }
 
+- (void)addToolTip:(NSString*)tooltip forRect:(NSRect)aRect {
+  [currentToolTips_ addObject:tooltip];
+  [self addToolTipRect:aRect owner:tooltip userData:nil];
+}
+
 // TODO(shess): -resetFieldEditorFrameIfNeeded is the place where
 // changes to the cell layout should be flushed.  LocationBarViewMac
 // and ToolbarController are calling this routine directly, and I
 // think they are probably wrong.
 // http://crbug.com/40053
 - (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
   // subviews. Unless more tooltips are added to this view, this should suffice
   // in place of managing a set of NSToolTipTag objects.
   [self removeAllToolTips];
+
+  // Reload the decoration tooltips.
   [currentToolTips_ removeAllObjects];
-
-  AutocompleteTextFieldCell* cell = [self cell];
-  for (AutocompleteTextFieldIcon* icon in [cell layedOutIcons:[self bounds]]) {
-    NSRect iconRect = [icon rect];
-    NSString* tooltip = [icon view]->GetToolTip();
-    if (!tooltip)
-      continue;
-
-    // -[NSView addToolTipRect:owner:userData] does _not_ retain its |owner:|.
-    // Put the string in a collection so it can't be dealloced while in use.
-    [currentToolTips_ addObject:tooltip];
-    [self addToolTipRect:iconRect owner:tooltip userData:nil];
-  }
+  [[self cell] updateToolTipsInRect:[self bounds] ofView:self];
 }
 
 // NOTE(shess): http://crbug.com/19116 describes a weird bug which
 // happens when the user runs a Print panel on Leopard.  After that,
 // spurious -controlTextDidBeginEditing notifications are sent when an
 // NSTextField is firstResponder, even though -currentEditor on that
 // field returns nil.  That notification caused significant problems
 // in AutocompleteEditViewMac.  -textDidBeginEditing: was NOT being
 // sent in those cases, so this approach doesn't have the problem.
 - (void)textDidBeginEditing:(NSNotification*)aNotification {
@@ skipping 142 matching lines @@
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
   return [dropHandler_ performDragOperation:sender];
 }
 
 - (NSMenu*)decorationMenuForEvent:(NSEvent*)event {
   AutocompleteTextFieldCell* cell = [self cell];
   return [cell decorationMenuForEvent:event inRect:[self bounds] ofView:self];
 }
 
 @end