diff options
Diffstat (limited to 'chrome')
3 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 69e8a9b..13a4413 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -49,7 +49,7 @@ AutocompleteEditViewGtk::AutocompleteEditViewGtk( command_updater_(command_updater), popup_window_mode_(false), // TODO(deanm) scheme_security_level_(ToolbarModel::NORMAL) { - model_->set_popup_model(popup_view_->model()); + model_->set_popup_model(popup_view_->GetModel()); } AutocompleteEditViewGtk::~AutocompleteEditViewGtk() { @@ -247,7 +247,7 @@ void AutocompleteEditViewGtk::UpdatePopup() { } void AutocompleteEditViewGtk::ClosePopup() { - popup_view_->model()->StopAutocomplete(); + popup_view_->GetModel()->StopAutocomplete(); } void AutocompleteEditViewGtk::OnTemporaryTextMaybeChanged( diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index a93e9ab..74006d5 100755 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -145,6 +145,10 @@ void AutocompletePopupViewGtk::PaintUpdatesNow() { gdk_window_process_updates(window_->window, FALSE); } +AutocompletePopupModel* AutocompletePopupViewGtk::GetModel() { + return model_.get(); +} + void AutocompletePopupViewGtk::Show(size_t num_results) { gint x, y, width; edit_view_->BottomLeftPosWidth(&x, &y, &width); diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h index c1bd5ef..f515fa6 100755 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h @@ -34,8 +34,7 @@ class AutocompletePopupViewGtk : public AutocompletePopupView { virtual void UpdatePopupAppearance(); virtual void OnHoverEnabledOrDisabled(bool disabled); virtual void PaintUpdatesNow(); - - AutocompletePopupModel* model() { return model_.get(); } + virtual AutocompletePopupModel* GetModel(); private: void Show(size_t num_results); |