[Mac] Implements context menus for Page Actions. Introduces a reusable subcla...

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 52 matching lines @@
 // field editor area, and if so sets the selection to {0,0} to clear
 // the selection before forwarding the event to the field editor for
 // processing (it will set the cursor position).  This also starts the
 // click-drag selection machinery.
 //
 // This code does the same thing for cases where the click was in the
 // decoration area.  This allows the user to click-drag starting from
 // a decoration area and get the expected selection behaviour,
 // likewise for multiple clicks in those areas.
 - (void)mouseDown:(NSEvent*)theEvent {
-  const NSPoint locationInWindow = [theEvent locationInWindow];
-  const NSPoint location = [self convertPoint:locationInWindow fromView:nil];
+  const NSPoint location =
+      [self convertPoint:[theEvent locationInWindow] fromView:nil];
+  const NSRect bounds([self bounds]);
 
   AutocompleteTextFieldCell* cell = [self autocompleteTextFieldCell];
-  const NSRect textFrame([cell textFrameForFrame:[self bounds]]);
+  const NSRect textFrame([cell textFrameForFrame:bounds]);
 
   // A version of the textFrame which extends across the field's
   // entire width.
-  const NSRect bounds([self bounds]);
+
   const NSRect fullFrame(NSMakeRect(bounds.origin.x, textFrame.origin.y,
                                     bounds.size.width, textFrame.size.height));
 
   // If the mouse is in the editing area, or above or below where the
   // editing area would be if we didn't add decorations, forward to
   // NSTextField -mouseDown: because it does the right thing.  The
   // above/below test is needed because NSTextView treats mouse events
   // above/below as select-to-end-in-that-direction, which makes
   // things janky.
-  if (NSMouseInRect(location, textFrame, [self isFlipped]) ||
-      !NSMouseInRect(location, fullFrame, [self isFlipped])) {
+  BOOL flipped = [self isFlipped];
+  if (NSMouseInRect(location, textFrame, flipped) ||
+      !NSMouseInRect(location, fullFrame, flipped)) {
     [super mouseDown:theEvent];
 
     // After the event has been handled, if the current event is a
     // mouse up and no selection was created (the mouse didn't move),
     // select the entire field.
     // NOTE(shess): This does not interfere with single-clicking to
     // place caret after a selection is made.  An NSTextField only has
     // a selection when it has a field editor.  The field editor is an
     // NSText subview, which will receive the -mouseDown: in that
     // case, and this code will never fire.
     NSText* editor = [self currentEditor];
     if (editor) {
       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:[self bounds]];
-  if (NSMouseInRect(location, hintIconFrame, [self isFlipped])) {
+  const NSRect hintIconFrame = [cell securityImageFrameForFrame:bounds];
+  if (NSMouseInRect(location, hintIconFrame, flipped)) {
     [cell onSecurityIconMousePressed];
     return;
   }
 
-  // If the user clicked a Page Action icon, execute its action.
-  const NSRect iconFrame([self bounds]);
+  const BOOL ctrlKey = ([theEvent modifierFlags] & NSControlKeyMask) != 0;
+  NSLog(@"Control key pressed? => %d", ctrlKey);
+  // 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:iconFrame];
-    if (NSMouseInRect(location, pageActionFrame, [self isFlipped])) {
-      // TODO(pamg): Do we need to send the event?
+    NSRect pageActionFrame = [cell pageActionFrameForIndex:i inFrame:bounds];
+    if (NSMouseInRect(location, pageActionFrame, flipped) && !ctrlKey) {
       [cell onPageActionMousePressedIn:pageActionFrame forIndex:i];
       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.
@@ skipping 183 matching lines @@
 - (void)draggingExited:(id<NSDraggingInfo>)sender {
   return [dropHandler_ draggingExited:sender];
 }
 
 // (URLDropTarget protocol)
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
   return [dropHandler_ performDragOperation:sender];
 }
 
 @end