Restoring r29827....

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.
 
 #include "chrome/browser/cocoa/autocomplete_text_field.h"
 
 #include "base/logging.h"
 #include "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 
 @implementation AutocompleteTextField
@@ skipping 125 matching lines @@
       NSEvent* currentEvent = [NSApp currentEvent];
       if ([currentEvent type] == NSLeftMouseUp &&
           ![editor selectedRange].length) {
         [editor selectAll:nil];
       }
     }
 
     return;
   }
 
-  // Check to see if the user clicked the hint icon in the cell. If so, we need
-  // to display the page info window.
-  const NSRect hintIconFrame = [cell hintImageFrameForFrame:[self bounds]];
+  // Check to see if the user clicked the security hint icon in the cell. If so,
+  // we need to display the page info window.
+  const NSRect hintIconFrame = [cell securityImageFrameForFrame:[self bounds]];
   if (NSMouseInRect(location, hintIconFrame, [self isFlipped])) {
-    observer_->OnSecurityIconClicked();
+    [cell onSecurityIconMousePressed];
     return;
   }
 
   NSText* editor = [self currentEditor];
 
   // We should only be here if we accepted first-responder status and
   // have a field editor.  If one of these fires, it means some
   // assumptions are being broken.
   DCHECK(editor != nil);
   DCHECK([editor isDescendantOf:self]);
@@ skipping 41 matching lines @@
     // assumptions still hold, here.
     DCHECK([editor isKindOfClass:[NSTextView class]]);
 
     NSTextStorage* textStorage = [editor textStorage];
     DCHECK(textStorage);
     [textStorage setAttributedString:aString];
   }
 }
 
 @end