Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Unified Diff: chrome/browser/autocomplete/autocomplete_edit_view_views.cc

Issue 6349101: Create a new autocomplete popup for touch. This CL depends on (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: addressed reviewer comments Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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),

Powered by Google App Engine
This is Rietveld 408576698