diff options
| author | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 20:10:40 +0000 |
|---|---|---|
| committer | varunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 20:10:40 +0000 |
| commit | aa2d0589420f69546d87a889a04ef23583e72fa5 (patch) | |
| tree | 1bd0cba2701b3f86ee78684c449525422d8c19c6 /chrome/browser/autocomplete | |
| parent | 8ef40ce033fa29063650605be3e498a804a5d971 (diff) | |
| download | chromium_src-aa2d0589420f69546d87a889a04ef23583e72fa5.zip chromium_src-aa2d0589420f69546d87a889a04ef23583e72fa5.tar.gz chromium_src-aa2d0589420f69546d87a889a04ef23583e72fa5.tar.bz2 | |
Create a new autocomplete popup for touch. This CL depends on
http://codereview.chromium.org/6286092/
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6349101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75414 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_views.cc | 15 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_edit_view_views.h | 3 |
2 files changed, 16 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc index 0afef21..e2826b1 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc @@ -14,6 +14,7 @@ #include "chrome/browser/command_updater.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" +#include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/common/notification_service.h" #include "googleurl/src/gurl.h" @@ -111,8 +112,7 @@ AutocompleteEditViewViews::AutocompleteEditViewViews( bool popup_window_mode, const views::View* location_bar) : model_(new AutocompleteEditModel(this, controller, profile)), - popup_view_(new AutocompletePopupContentsView( - gfx::Font(), this, model_.get(), profile, location_bar)), + popup_view_(CreatePopupView(profile, location_bar)), controller_(controller), toolbar_model_(toolbar_model), command_updater_(command_updater), @@ -648,3 +648,14 @@ void AutocompleteEditViewViews::SelectRange(size_t caret, size_t end) { const views::TextRange range(caret, end); textfield_->SelectRange(range); } + +AutocompletePopupView* AutocompleteEditViewViews::CreatePopupView( + Profile* profile, + const View* location_bar) { +#if defined(TOUCH_UI) + return new TouchAutocompletePopupContentsView( +#else + return new AutocompletePopupContentsView( +#endif + gfx::Font(), this, model_.get(), profile, location_bar); +} diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.h b/chrome/browser/autocomplete/autocomplete_edit_view_views.h index 92279cc..f58915b 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_views.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.h @@ -150,6 +150,9 @@ class AutocompleteEditViewViews : public views::View, // Selects the text given by |caret| and |end|. void SelectRange(size_t caret, size_t end); + AutocompletePopupView* CreatePopupView(Profile* profile, + const View* location_bar); + views::Textfield* textfield_; scoped_ptr<AutocompleteEditModel> model_; |