Index: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc |
=================================================================== |
--- chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc (revision 92600) |
+++ chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc (working copy) |
@@ -274,7 +274,7 @@ |
gfx::Rect contents_rect = GetContentsBounds(); |
int top = contents_rect.y(); |
for (int i = 0; i < child_count(); ++i) { |
- View* v = GetChildViewAt(i); |
+ View* v = child_at(i); |
if (v->IsVisible()) { |
v->SetBounds(contents_rect.x(), top, contents_rect.width(), |
v->GetPreferredSize().height()); |
@@ -291,7 +291,7 @@ |
} |
void AutocompletePopupContentsView::InvalidateLine(size_t line) { |
- GetChildViewAt(static_cast<int>(line))->SchedulePaint(); |
+ child_at(static_cast<int>(line))->SchedulePaint(); |
} |
void AutocompletePopupContentsView::UpdatePopupAppearance() { |
@@ -323,13 +323,13 @@ |
CreateResultView(this, i, result_font_, result_bold_font_); |
AddChildViewAt(result_view, static_cast<int>(i)); |
} else { |
- result_view = static_cast<AutocompleteResultView*>(GetChildViewAt(i)); |
+ result_view = static_cast<AutocompleteResultView*>(child_at(i)); |
result_view->SetVisible(true); |
} |
result_view->SetMatch(GetMatchAtIndex(i)); |
} |
for (size_t i = model_->result().size(); i < child_rv_count; ++i) |
- GetChildViewAt(i)->SetVisible(false); |
+ child_at(i)->SetVisible(false); |
PromoCounter* counter = model_->profile()->GetInstantPromoCounter(); |
if (!opt_in_view_ && counter && counter->ShouldShow(base::Time::Now())) { |
@@ -515,7 +515,7 @@ |
DCHECK_GE(static_cast<size_t>(child_count()), model_->result().size()); |
int popup_height = 0; |
for (size_t i = 0; i < model_->result().size(); ++i) |
- popup_height += GetChildViewAt(i)->GetPreferredSize().height(); |
+ popup_height += child_at(i)->GetPreferredSize().height(); |
return popup_height + |
(opt_in_view_ ? opt_in_view_->GetPreferredSize().height() : 0); |
} |
@@ -659,7 +659,7 @@ |
int nb_match = model_->result().size(); |
DCHECK(nb_match <= child_count()); |
for (int i = 0; i < nb_match; ++i) { |
- views::View* child = GetChildViewAt(i); |
+ views::View* child = child_at(i); |
gfx::Point point_in_child_coords(point); |
View::ConvertPointToView(this, child, &point_in_child_coords); |
if (child->HitTest(point_in_child_coords)) |