Mac: Clicking an omnibox decoration should not highlight the omnibox.

chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm

 // Copyright (c) 2011 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/ui/cocoa/location_bar/autocomplete_text_field.h"
 
 #include "base/logging.h"
+#include "base/mac/foundation_util.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 namespace {
@@ skipping 125 matching lines @@
         [editor selectAll:nil];
       }
     }
 
     return;
   }
 
   // Give the cell a chance to intercept clicks in page-actions and
   // other decorative items.
   if ([cell mouseDown:theEvent inRect:bounds ofView:self]) {
+    // If a decoration intercepted the click, then the text field should resign
+    // first responder.
+    NSView* firstResponder =
+        base::mac::ObjCCast<NSView>([[self window] firstResponder]);
+    if ([firstResponder isDescendantOf:self])
+      [[self window] makeFirstResponder:nil];
     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 222 matching lines @@
 // causes a select-all, even if the decoration handles the click.  If
 // the field editor is already in place, don't accept first responder
 // again.  This allows the selection to be unmodified if the click is
 // handled by a decoration or context menu (|-mouseDown:| will still
 // change it if appropriate).
 - (BOOL)acceptsFirstResponder {
   if ([self currentEditor]) {
     DCHECK_EQ([self currentEditor], [[self window] firstResponder]);
     return NO;
   }
+
+  // If the event is a left-mouse click, and it lands on a decoration, then the
+  // event should not cause the text field to become first responder.
+  NSEvent* event = [NSApp currentEvent];
+  if ([event type] == NSLeftMouseDown) {
+    LocationBarDecoration* decoration =
+        [[self cell] decorationForEvent:event inRect:[self bounds] ofView:self];
+    if (decoration && decoration->AcceptsMousePress())
+      return NO;
+  }
+
   return [super acceptsFirstResponder];
 }
 
 // (Overridden from NSResponder)
 - (BOOL)becomeFirstResponder {
   BOOL doAccept = [super becomeFirstResponder];
   if (doAccept) {
     [[BrowserWindowController browserWindowControllerForView:self]
         lockBarVisibilityForOwner:self withAnimation:YES delay:NO];
 
@@ skipping 101 matching lines @@
                                   NSMinY(frame),
                                   suggestWidth,
                                   NSHeight(frame));
 
   gfx::ScopedNSGraphicsContextSaveGState saveGState;
   NSRectClip(suggestRect);
   [cell drawInteriorWithFrame:frame inView:controlView];
 }
 
 }  // namespace autocomplete_text_field