summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-12 01:34:18 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-12 01:34:18 +0000
commit30179058aa633f1052869d75936a09dd8e7b9cf7 (patch)
tree72ef7f6f34bbdd0e8c3d5565ea3bac1f0aba0099 /chrome/browser/autocomplete
parentf8d60f4b509c4673d5e9558e822dca3de4183e99 (diff)
downloadchromium_src-30179058aa633f1052869d75936a09dd8e7b9cf7.zip
chromium_src-30179058aa633f1052869d75936a09dd8e7b9cf7.tar.gz
chromium_src-30179058aa633f1052869d75936a09dd8e7b9cf7.tar.bz2
[Mac] Initial Instant implementation.
This is a very rough cut. Many things are still unfinished and will be fixed in future CLs: - Clicking on instant results clears the results. - Suggestions do not work yet. - The omnibox popup overlaps with instant results. - HTTP auth dialogs cause crashes. BUG=56385 TEST=No visible impact when --enable-match-preview is not set on the command line. TEST=Instant results should appear when typing in the omnibox. TEST=Instant results should disappear when clicking outside the browser window or clicking on devtools or the sidebar. Review URL: http://codereview.chromium.org/3624001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_mac.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 0c2646e..46bab39 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -429,6 +429,9 @@ void AutocompleteEditViewMac::UpdatePopup() {
}
void AutocompleteEditViewMac::ClosePopup() {
+ if (popup_view_->GetModel()->IsOpen())
+ controller_->OnAutocompleteWillClosePopup();
+
popup_view_->GetModel()->StopAutocomplete();
}
@@ -762,6 +765,7 @@ void AutocompleteEditViewMac::OnSetFocus(bool control_down) {
void AutocompleteEditViewMac::OnKillFocus() {
// Tell the model to reset itself.
+ controller_->OnAutocompleteLosingFocus(NULL);
model_->OnKillFocus();
controller_->OnKillFocus();
}