summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-10 20:59:18 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-10 20:59:18 +0000
commit252a08e356dc7ce6878dca7d01f834cb9fce1780 (patch)
tree6d7b12a9624f3387d1b7927f026ad3d544635dae /chrome
parent1274bdad58253fe4137d29db4975291cf46bcb94 (diff)
downloadchromium_src-252a08e356dc7ce6878dca7d01f834cb9fce1780.zip
chromium_src-252a08e356dc7ce6878dca7d01f834cb9fce1780.tar.gz
chromium_src-252a08e356dc7ce6878dca7d01f834cb9fce1780.tar.bz2
Fix build bustage - make sure GTK Autocomplete edit/popup implement the GetModel interface method.
TBR=deanm Review URL: http://codereview.chromium.org/66052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc4
-rwxr-xr-xchrome/browser/autocomplete/autocomplete_popup_view_gtk.cc4
-rwxr-xr-xchrome/browser/autocomplete/autocomplete_popup_view_gtk.h3
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);