| Index: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
|
| diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
|
| index 4888a4aa6682b50767e2706a878d1eb916ecb617..ebb15c0c949200451bdc737ad735c522541360aa 100644
|
| --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
|
| +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
|
| @@ -383,7 +383,7 @@ void AutocompletePopupContentsView::OnPaint(gfx::Canvas* canvas) {
|
| // shader to fill a path representing the round-rect clipping region. This
|
| // yields a nice anti-aliased edge.
|
| gfx::CanvasSkia contents_canvas(width(), height(), true);
|
| - PaintChildren(&contents_canvas);
|
| + PaintResultViews(&contents_canvas);
|
|
|
| // We want the contents background to be slightly transparent so we can see
|
| // the blurry glass effect on DWM systems behind. We do this _after_ we paint
|
| @@ -412,12 +412,6 @@ void AutocompletePopupContentsView::OnPaint(gfx::Canvas* canvas) {
|
| OnPaintBorder(canvas);
|
| }
|
|
|
| -void AutocompletePopupContentsView::PaintChildren(gfx::CanvasSkia* canvas) {
|
| - canvas->drawColor(AutocompleteResultView::GetColor(
|
| - AutocompleteResultView::NORMAL, AutocompleteResultView::BACKGROUND));
|
| - View::PaintChildren(canvas);
|
| -}
|
| -
|
| void AutocompletePopupContentsView::Layout() {
|
| UpdateBlurRegion();
|
|
|
| @@ -512,6 +506,12 @@ views::View* AutocompletePopupContentsView::GetViewForPoint(
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // AutocompletePopupContentsView, protected:
|
|
|
| +void AutocompletePopupContentsView::PaintResultViews(gfx::CanvasSkia* canvas) {
|
| + canvas->drawColor(AutocompleteResultView::GetColor(
|
| + AutocompleteResultView::NORMAL, AutocompleteResultView::BACKGROUND));
|
| + View::PaintChildren(canvas);
|
| +}
|
| +
|
| int AutocompletePopupContentsView::CalculatePopupHeight() {
|
| DCHECK_GE(static_cast<size_t>(child_count()), model_->result().size());
|
| int popup_height = 0;
|
|
|