Mac: Content blocked icons.

chrome/browser/cocoa/autocomplete_text_field.mm

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/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"
 #import "chrome/browser/cocoa/url_drop_target.h"
@@ skipping 96 matching lines @@
       NSEvent* currentEvent = [NSApp currentEvent];
       if ([currentEvent type] == NSLeftMouseUp &&
           ![editor selectedRange].length) {
         [editor selectAll:nil];
       }
     }
 
     return;
   }
 
-  // If the user clicked the security hint icon in the cell, display the page
-  // info window.
-  const NSRect hintIconFrame = [cell securityImageFrameForFrame:bounds];
-  if (NSMouseInRect(location, hintIconFrame, flipped)) {
-    [cell onSecurityIconMousePressed];
-    return;
-  }
-
+  // If the user clicked on one of the icons (security icon, Page Actions, etc),
+  // let the icon handle the click.
   const BOOL ctrlKey = ([theEvent modifierFlags] & NSControlKeyMask) != 0;
-  // If the user left-clicked a Page Action icon, execute its action.
-  const size_t pageActionCount = [cell pageActionCount];
-  for (size_t i = 0; i < pageActionCount; ++i) {
-    NSRect pageActionFrame = [cell pageActionFrameForIndex:i inFrame:bounds];
-    if (NSMouseInRect(location, pageActionFrame, flipped) && !ctrlKey) {
-      [cell onPageActionMousePressedIn:pageActionFrame forIndex:i];
+  for (AutocompleteTextFieldIcon* icon in [cell layedOutIcons:bounds]) {
+    if (NSMouseInRect(location, [icon rect], flipped) && !ctrlKey) {
+      [icon view]->OnMousePressed([icon rect]);
       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);
@@ skipping 54 matching lines @@
   [undoManager_ removeAllActions];
 }
 
 // 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: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:fieldBounds];
-    [self addCursorRect:iconRect cursor:[NSCursor arrowCursor]];
-  }
+  for (AutocompleteTextFieldIcon* icon in [cell layedOutIcons:fieldBounds])
+    [self addCursorRect:[icon rect] 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
   // subviews. Unless more tooltips are added to this view, this should suffice
   // in place of managing a set of NSToolTipTag objects.
   [self removeAllToolTips];
   [currentToolTips_ removeAllObjects];
 
   AutocompleteTextFieldCell* cell = [self autocompleteTextFieldCell];
-  const size_t pageActionCount = [cell pageActionCount];
-  for (size_t i = 0; i < pageActionCount; ++i) {
-    NSRect iconRect = [cell pageActionFrameForIndex:i inFrame:[self bounds]];
-    NSString* tooltip = [cell pageActionToolTipForIndex:i];
+  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 the owner!
+    // -[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];
   }
 }
 
 // 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
@@ 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