| Index: chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.cc
|
| diff --git a/chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.cc
|
| index fd3612400c884022d883340080a79b1554e986f8..5c6c3efc16d2ef9b7a67267c708c91e609143cac 100644
|
| --- a/chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.cc
|
| +++ b/chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.cc
|
| @@ -5,6 +5,7 @@
|
| #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"
|
| @@ -15,11 +16,12 @@
|
|
|
| // 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);
|
| @@ -57,8 +59,9 @@ 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() {
|
| @@ -100,7 +103,8 @@ 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() {
|
|
|