Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm

Issue 1011943002: Mac: Clicking an omnibox decoration should not highlight the omnibox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm
index 6c25cc82855b4c1f9dfe9e570a413e9aaf04c648..08884d2f44817dea742adfea54bf9f9002660ec7 100644
--- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm
+++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.mm
@@ -397,6 +397,16 @@ const CGFloat kAnimationDuration = 0.2;
// (Overridden from NSResponder)
- (BOOL)becomeFirstResponder {
+ // 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)
+ return NO;
+ }
+
BOOL doAccept = [super becomeFirstResponder];
if (doAccept) {
[[BrowserWindowController browserWindowControllerForView:self]

Powered by Google App Engine
This is Rietveld 408576698