summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 20:14:03 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 20:14:03 +0000
commit4363d13f155fd3eabacffce58a31b1d0dbfd0368 (patch)
tree16760c1621df4cc772f1cfc2f2ae2ccdd92cc265 /chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
parenta5e4a7afe323985b7ec59d58972876786550faae (diff)
downloadchromium_src-4363d13f155fd3eabacffce58a31b1d0dbfd0368.zip
chromium_src-4363d13f155fd3eabacffce58a31b1d0dbfd0368.tar.gz
chromium_src-4363d13f155fd3eabacffce58a31b1d0dbfd0368.tar.bz2
Backing out r20493 (http://codereview.chromium.org/149492), as it inadvertently killed the Omnibox suggestion list.
BUG=http://crbug.com/16714 TEST=Type in the omnibox; you should get a suggestion list. Review URL: http://codereview.chromium.org/149622 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_edit_view_mac.mm')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_mac.mm9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 9fe6ab9..6f8f6c8 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -549,8 +549,13 @@ void AutocompleteEditViewMac::AcceptInput(
}
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