Mac: Content blocked icons.

chrome/browser/cocoa/autocomplete_text_field_editor.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/autocomplete_text_field_editor.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/string_util.h"
 #include "grit/generated_resources.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"  // IDC_*
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
-#import "chrome/browser/cocoa/extensions/extension_action_context_menu.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/browser/profile.h"
 
 class Extension;
 
 @interface AutocompleteTextFieldEditor(Private)
 // Returns the default context menu to be displayed on a right mouse click.
 - (NSMenu*)defaultMenuForEvent:(NSEvent*)event;
@@ skipping 62 matching lines @@
 // No ruler bar, so don't update any of that state, either.
 - (void)updateRuler {}
 
 - (NSMenu*)menuForEvent:(NSEvent*)event {
   NSPoint location = [self convertPoint:[event locationInWindow] fromView:nil];
 
   // Was the right click within a Page Action? Show a different menu if so.
   AutocompleteTextField* field = (AutocompleteTextField*)[self delegate];
   NSRect bounds([field bounds]);
   AutocompleteTextFieldCell* cell = [field autocompleteTextFieldCell];
-  const size_t pageActionCount = [cell pageActionCount];
   BOOL flipped = [self isFlipped];
-  if (!profile_)
-    return [self defaultMenuForEvent:event];
 
-  ExtensionsService* service = profile_->GetExtensionsService();
-  if (!service)
-    return [self defaultMenuForEvent:event];
-
-  for (size_t i = 0; i < pageActionCount; ++i) {
-    NSRect pageActionFrame = [cell pageActionFrameForIndex:i inFrame:bounds];
-    if (NSMouseInRect(location, pageActionFrame, flipped)) {
-      Extension* extension = service->GetExtensionById(
-          [cell pageActionForIndex:i]->extension_id(), false);
-      DCHECK(extension);
-      if (!extension)
-        break;
-      return [[[ExtensionActionContextMenu alloc]
-          initWithExtension:extension profile:profile_] autorelease];
+  for (AutocompleteTextFieldIcon* icon in [cell layedOutIcons:bounds]) {
+    if (NSMouseInRect(location, [icon rect], flipped)) {
+      NSMenu* menu = [icon view]->GetMenu();
+      if (menu)
+        return menu;
     }
   }
 
   // Otherwise, simply return the default menu for this instance.
   return [self defaultMenuForEvent:event];
 }
 
 - (NSMenu*)defaultMenuForEvent:(NSEvent*)event {
   NSMenu* menu = [[[NSMenu alloc] initWithTitle:@"TITLE"] autorelease];
   [menu addItemWithTitle:l10n_util::GetNSStringWithFixup(IDS_CUT)
@@ skipping 94 matching lines @@
 - (void)draggingExited:(id<NSDraggingInfo>)sender {
   return [dropHandler_ draggingExited:sender];
 }
 
 // (URLDropTarget protocol)
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
   return [dropHandler_ performDragOperation:sender];
 }
 
 @end