First stab at touch optimized omnibox auto-complete per sgabriel's mocks.

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #if defined(OS_WIN)
 #include <commctrl.h>
 #include <dwmapi.h>
 #include <objidl.h>
 #endif
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/views/autocomplete/autocomplete_result_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkShader.h"
+#include "ui/base/layout.h"

[Peter Kasting, 2012/05/04 23:33:31]

Nit: I think this goes below the next #include?

[Jói, 2012/05/07 16:26:18]

Fixed here and checked other files to be sure there were no other instances of
this.

 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 35 matching lines @@
   AutocompletePopupWidget() {}
   virtual ~AutocompletePopupWidget() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupWidget);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, public:
 
+AutocompletePopupContentsView*
+AutocompletePopupContentsView::CreateForEnvironment(

[Peter Kasting, 2012/05/04 23:33:31]

Nit: Indent 4

[Jói, 2012/05/07 16:26:18]

Done.

+    const gfx::Font& font,
+    OmniboxView* omnibox_view,
+    AutocompleteEditModel* edit_model,
+    views::View* location_bar) {
+  AutocompletePopupContentsView* view = NULL;
+  switch (ui::GetDisplayLayout()) {

[Peter Kasting, 2012/05/04 23:33:31]

Nit: Use if/else rather than switch

[Jói, 2012/05/07 16:26:18]

Done.

+    case ui::LAYOUT_TOUCH:
+      view = new TouchAutocompletePopupContentsView(
+          font, omnibox_view, edit_model, location_bar);
+      break;
+
+    default:
+      view = new AutocompletePopupContentsView(
+          font, omnibox_view, edit_model, location_bar);
+  }
+
+  view->Init();
+  return view;
+}
+
 AutocompletePopupContentsView::AutocompletePopupContentsView(
     const gfx::Font& font,
     OmniboxView* omnibox_view,
     AutocompleteEditModel* edit_model,
     views::View* location_bar)
     : model_(new AutocompletePopupModel(this, edit_model)),
       omnibox_view_(omnibox_view),
       profile_(edit_model->profile()),
       location_bar_(location_bar),
       result_font_(font.DeriveFont(kEditFontAdjust)),
       result_bold_font_(result_font_.DeriveFont(0, gfx::Font::BOLD)),
       ignore_mouse_drag_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) {
   // The following little dance is required because set_border() requires a
   // pointer to a non-const object.
   views::BubbleBorder* bubble_border =
       new views::BubbleBorder(views::BubbleBorder::NONE,
                               views::BubbleBorder::NO_SHADOW);
   bubble_border_ = bubble_border;
   set_border(bubble_border);
   // The contents is owned by the LocationBarView.
   set_parent_owned(false);
+}
 
+void AutocompletePopupContentsView::Init() {
+  // This can't be done in the constructor as at that point we aren't
+  // necessarily our final class yet, and we may have subclasses
+  // overriding CreateResultView.
   for (size_t i = 0; i < AutocompleteResult::kMaxMatches; ++i) {
     AutocompleteResultView* result_view =
         CreateResultView(this, i, result_font_, result_bold_font_);
     result_view->SetVisible(false);
     AddChildViewAt(result_view, static_cast<int>(i));
   }
 }
 
 AutocompletePopupContentsView::~AutocompletePopupContentsView() {
   // We don't need to do anything with |popup_| here.  The OS either has already
@@ skipping 417 matching lines @@
     // bubble appear at the same height as the Star bubble.
     location_bar_bounds.Inset(LocationBarView::kNormalHorizontalEdgeThickness,
                               0);
   }
   gfx::Point location_bar_origin(location_bar_bounds.origin());
   views::View::ConvertPointToScreen(location_bar_, &location_bar_origin);
   location_bar_bounds.set_origin(location_bar_origin);
   return bubble_border_->GetBounds(
       location_bar_bounds, gfx::Size(location_bar_bounds.width(), h));
 }