diff options
Diffstat (limited to 'chrome/browser/autocomplete')
6 files changed, 20 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 8d31941..37de68d 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -36,6 +36,10 @@ /////////////////////////////////////////////////////////////////////////////// // AutocompleteEditController +bool AutocompleteEditController::AcceptCurrentInstantPreview() { + return false; +} + AutocompleteEditController::~AutocompleteEditController() { } diff --git a/chrome/browser/autocomplete/autocomplete_edit.h b/chrome/browser/autocomplete/autocomplete_edit.h index 983a5f5..4f0b5d8 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.h +++ b/chrome/browser/autocomplete/autocomplete_edit.h @@ -52,7 +52,7 @@ class AutocompleteEditController { // Accepts the currently showing instant preview, if any, and returns true. // Returns false if there is no instant preview showing. - virtual bool AcceptCurrentInstantPreview() { return false; } + virtual bool AcceptCurrentInstantPreview(); // Sets the suggested search text to |suggested_text|. virtual void OnSetSuggestedSearchText(const string16& suggested_text) = 0; diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index ca70f1b..77b207a 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -462,6 +462,14 @@ gfx::Font AutocompleteEditViewGtk::GetFont() { rc_style->font_desc : text_view_->style->font_desc); } +AutocompleteEditModel* AutocompleteEditViewGtk::model() { + return model_.get(); +} + +const AutocompleteEditModel* AutocompleteEditViewGtk::model() const { + return model_.get(); +} + void AutocompleteEditViewGtk::SaveStateToTab(TabContents* tab) { DCHECK(tab); // If any text has been selected, register it as the PRIMARY selection so it diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h index 21f4a93..66c7541 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h @@ -93,8 +93,8 @@ class AutocompleteEditViewGtk : public AutocompleteEditView, gfx::Font GetFont(); // Implement the AutocompleteEditView interface. - virtual AutocompleteEditModel* model() { return model_.get(); } - virtual const AutocompleteEditModel* model() const { return model_.get(); } + virtual AutocompleteEditModel* model(); + virtual const AutocompleteEditModel* model() const; virtual void SaveStateToTab(TabContents* tab); diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 8068c11..e7da263 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -337,6 +337,10 @@ AutocompletePopupViewGtk::~AutocompletePopupViewGtk() { g_object_unref(it->second); } +bool AutocompletePopupViewGtk::IsOpen() const { + return opened_; +} + void AutocompletePopupViewGtk::InvalidateLine(size_t line) { // TODO(deanm): Is it possible to use some constant for the width, instead // of having to query the width of the window? diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h index 590cc41..0632635 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h @@ -35,7 +35,7 @@ class AutocompletePopupViewGtk : public AutocompletePopupView, ~AutocompletePopupViewGtk(); // Overridden from AutocompletePopupView: - virtual bool IsOpen() const { return opened_; } + virtual bool IsOpen() const; virtual void InvalidateLine(size_t line); virtual void UpdatePopupAppearance(); virtual gfx::Rect GetTargetBounds(); |