Index: chrome/browser/autocomplete/autocomplete_edit_view_mac.mm |
=================================================================== |
--- chrome/browser/autocomplete/autocomplete_edit_view_mac.mm (revision 20621) |
+++ chrome/browser/autocomplete/autocomplete_edit_view_mac.mm (working copy) |
@@ -549,8 +549,13 @@ |
} |
void AutocompleteEditViewMac::FocusLocation() { |
- [[field_ window] makeFirstResponder:field_]; |
- DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]); |
+ // -makeFirstResponder: will select the entire field_. If we're |
+ // already firstResponder, it's likely that we want to retain the |
+ // current selection. |
+ if (![field_ currentEditor]) { |
+ [[field_ window] makeFirstResponder:field_]; |
+ DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]); |
+ } |
} |
@implementation AutocompleteFieldDelegate |