diff options
3 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index 40e212b..c9ca5fc 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -6,6 +6,7 @@ #include "base/sys_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" +#include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" // Thin Obj-C bridge class that is the delegate of the omnibox field. @@ -137,7 +138,7 @@ void AutocompleteEditViewMac::UpdatePopup() { } void AutocompleteEditViewMac::ClosePopup() { - popup_view_->StopAutocomplete(); + popup_view_->GetModel()->StopAutocomplete(); } void AutocompleteEditViewMac::UpdateAndStyleText( diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h index 4a69413..6639c0f 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h @@ -67,7 +67,6 @@ class AutocompletePopupViewMac : public AutocompletePopupView { // Helpers which forward to model_, otherwise our Objective-C helper // object would need model_ to be public:. - void StopAutocomplete(); size_t ResultRowCount(); const std::wstring& ResultContentsAt(size_t i); bool ResultStarredAt(size_t i); diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm index 3d9a6d4..8ec24e0 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm @@ -169,10 +169,6 @@ AutocompletePopupModel* AutocompletePopupViewMac::GetModel() { return model_.get(); } -void AutocompletePopupViewMac::StopAutocomplete() { - model_->StopAutocomplete(); -} - size_t AutocompletePopupViewMac::ResultRowCount() { return model_->result().size(); } |