diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 19:40:33 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 19:40:33 +0000 |
| commit | fb5153c5dd44a771be0cbd030a02eccf5cde76ed (patch) | |
| tree | f1533b6d48fc5d4bc88729cb4a7fa885ca6e7d1a /chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | |
| parent | 7df4348513bd316224dbc1399990a2538c55a5bc (diff) | |
| download | chromium_src-fb5153c5dd44a771be0cbd030a02eccf5cde76ed.zip chromium_src-fb5153c5dd44a771be0cbd030a02eccf5cde76ed.tar.gz chromium_src-fb5153c5dd44a771be0cbd030a02eccf5cde76ed.tar.bz2 | |
Make TOOLKIT_VIEWS port use views-based Autocomplete popup.
The popups now interact with the edit via AutocompleteEditView rather than the platform-specific types.
Note this also removes the old omnibox popup code. It hasn't been active for some time.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/160378
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index ad197aa..dffc91a 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -18,7 +18,7 @@ #include "base/string_util.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" -#include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h" +#include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/defaults.h" #include "chrome/browser/profile.h" @@ -235,7 +235,7 @@ GdkPixbuf* IconForMatch(const AutocompleteMatch& match, bool selected) { } // namespace AutocompletePopupViewGtk::AutocompletePopupViewGtk( - AutocompleteEditViewGtk* edit_view, + AutocompleteEditView* edit_view, AutocompleteEditModel* edit_model, Profile* profile, AutocompletePopupPositioner* popup_positioner) @@ -508,3 +508,14 @@ gboolean AutocompletePopupViewGtk::HandleExpose(GtkWidget* widget, return TRUE; } + +// static +AutocompletePopupView* AutocompletePopupView::CreatePopupView( + const gfx::Font& font, + AutocompleteEditView* edit_view, + AutocompleteEditModel* edit_model, + Profile* profile, + AutocompletePopupPositioner* popup_positioner) { + return new AutocompletePopupViewGtk(edit_view, edit_model, profile, + popup_positioner); +} |