Restyle omnibox popup

chrome/browser/ui/views/omnibox/touch_omnibox_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/omnibox/touch_omnibox_popup_contents_view.h"
 
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
+#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/views/view.h"
 
 // TouchOmniboxResultView ------------------------------------------------
 
-TouchOmniboxResultView::TouchOmniboxResultView(OmniboxResultViewModel* model,
-                                               int model_index,
-                                               views::View* location_bar,
-                                               const gfx::Font& font)
-    : OmniboxResultView(model, model_index, location_bar, font) {
+TouchOmniboxResultView::TouchOmniboxResultView(
+    OmniboxResultViewModel* model,
+    int model_index,
+    LocationBarView* location_bar_view,
+    const gfx::Font& font)
+    : OmniboxResultView(model, model_index, location_bar_view, font) {
   set_edge_item_padding(8);
   set_item_padding(8);
   set_minimum_text_vertical_padding(10);
 }
 
 TouchOmniboxResultView::~TouchOmniboxResultView() {
 }
 
 void TouchOmniboxResultView::PaintMatch(gfx::Canvas* canvas,
                                         const AutocompleteMatch& match,
@@ skipping 17 matching lines @@
 int TouchOmniboxResultView::GetTextHeight() const {
   return OmniboxResultView::GetTextHeight() * 2;
 }
 
 // TouchOmniboxPopupContentsView -----------------------------------------
 
 TouchOmniboxPopupContentsView::TouchOmniboxPopupContentsView(
     const gfx::Font& font,
     OmniboxView* omnibox_view,
     OmniboxEditModel* edit_model,
-    views::View* location_bar)
-    : OmniboxPopupContentsView(font, omnibox_view, edit_model, location_bar) {
+    LocationBarView* location_bar_view)
+    : OmniboxPopupContentsView(font, omnibox_view, edit_model,
+                               location_bar_view) {
 }
 
 TouchOmniboxPopupContentsView::~TouchOmniboxPopupContentsView() {
 }
 
 void TouchOmniboxPopupContentsView::UpdatePopupAppearance() {
   OmniboxPopupContentsView::UpdatePopupAppearance();
   Layout();
 }
 
@@ skipping 21 matching lines @@
     int line_y = child->y() + child->height() - 1;
     canvas->DrawLine(gfx::Point(bounds.x(), line_y),
                      gfx::Point(bounds.right(), line_y), divider_color);
   }
 }
 
 OmniboxResultView* TouchOmniboxPopupContentsView::CreateResultView(
     OmniboxResultViewModel* model,
     int model_index,
     const gfx::Font& font) {
-  return new TouchOmniboxResultView(model, model_index, location_bar(), font);
+  return new TouchOmniboxResultView(model, model_index, location_bar_view(),
+                                    font);
 }
 
 std::vector<views::View*> TouchOmniboxPopupContentsView::GetVisibleChildren() {
   std::vector<View*> visible_children;
   for (int i = 0; i < child_count(); ++i) {
     View* v = child_at(i);
     if (child_at(i)->visible())
       visible_children.push_back(v);
   }
   return visible_children;
 }