summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 23:06:24 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 23:06:24 +0000
commit143e0135fd5e70e152dec0e9fdb4a8aa122dbb3c (patch)
treeddea48c90d7a6bdde7169ffd580a758f36a2b67a /chrome
parentb3746a9087bfd48cea3ad547eefd47ef9e1536ec (diff)
downloadchromium_src-143e0135fd5e70e152dec0e9fdb4a8aa122dbb3c.zip
chromium_src-143e0135fd5e70e152dec0e9fdb4a8aa122dbb3c.tar.gz
chromium_src-143e0135fd5e70e152dec0e9fdb4a8aa122dbb3c.tar.bz2
OS X: Clicking on search keyword autocomplete result should update the omnibox
BUG=54052 TEST=none Review URL: http://codereview.chromium.org/3300004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_mac.h3
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_mac.mm7
2 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
index a5e4e9a..e0a27d5 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
@@ -62,6 +62,9 @@ class AutocompletePopupViewMac : public AutocompletePopupView {
}
virtual void UpdatePopupAppearance();
+ // Set |line| to be selected.
+ void SetSelectedLine(size_t line);
+
// This is only called by model in SetSelectedLine() after updating
// everything. Popup should already be visible.
virtual void PaintUpdatesNow();
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
index 5adc929..c53fb4d 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
@@ -448,6 +448,10 @@ void AutocompletePopupViewMac::UpdatePopupAppearance() {
PositionPopup(rows * cellHeight);
}
+void AutocompletePopupViewMac::SetSelectedLine(size_t line) {
+ model_->SetSelectedLine(line, false);
+}
+
// This is only called by model in SetSelectedLine() after updating
// everything. Popup should already be visible.
void AutocompletePopupViewMac::PaintUpdatesNow() {
@@ -673,7 +677,8 @@ void AutocompletePopupViewMac::OpenURLForRow(int row, bool force_background) {
NSInteger row, column;
if ([self getRow:&row column:&column forPoint:point]) {
DCHECK_EQ(column, 0);
- [self selectCellAtRow:row column:column];
+ DCHECK(popupView_);
+ popupView_->SetSelectedLine(row);
return YES;
}
return NO;