Index: chrome/browser/autocomplete/autocomplete_edit_view_views.cc |
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc |
index 80baa0dcfc66bbf883520a3d8f5079d5e26346e4..12bbccdfe2318083ab2b45a7be41c0aa6137ecbc 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" |
@@ -110,7 +111,11 @@ AutocompleteEditViewViews::AutocompleteEditViewViews( |
bool popup_window_mode, |
const views::View* location_bar) |
: model_(new AutocompleteEditModel(this, controller, profile)), |
+#if defined(TOUCH_UI) |
+ popup_view_(new TouchAutocompletePopupContentsView( |
+#else |
popup_view_(new AutocompletePopupContentsView( |
+#endif |
oshima
2011/02/16 20:00:27
I'd like to avoid having if/defs in initializer li
varunjain
2011/02/16 23:12:37
Done.
|
gfx::Font(), this, model_.get(), profile, location_bar)), |
controller_(controller), |
toolbar_model_(toolbar_model), |