Rework tree APIs to reflect Google style and more const-correctness....

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

 // Copyright (c) 2011 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"
 
 #include "base/compiler_specific.h"
 #include "base/i18n/bidi_line_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 819 matching lines @@
       // to that level.
       popup_->Close();  // This will eventually delete the popup.
       popup_.reset();
     }
     return;
   }
 
   // Update the match cached by each row, in the process of doing so make sure
   // we have enough row views.
   int total_child_height = 0;
-  size_t child_rv_count = GetChildViewCount();
+  size_t child_rv_count = child_count();
   if (opt_in_view_) {
     DCHECK(child_rv_count > 0);
     child_rv_count--;
   }
   for (size_t i = 0; i < model_->result().size(); ++i) {
     AutocompleteResultView* result_view;
     if (i >= child_rv_count) {
       result_view =
           new AutocompleteResultView(this, i, result_font_, result_bold_font_);
-      AddChildView(static_cast<int>(i), result_view);
+      AddChildViewAt(result_view, static_cast<int>(i));
     } else {
       result_view = static_cast<AutocompleteResultView*>(GetChildViewAt(i));
       result_view->SetVisible(true);
     }
     result_view->set_match(GetMatchAtIndex(i));
     total_child_height += result_view->GetPreferredSize().height();
   }
   for (size_t i = model_->result().size(); i < child_rv_count; ++i)
     GetChildViewAt(i)->SetVisible(false);
 
@@ skipping 123 matching lines @@
   // This looks slightly better in the corners than drawing the contents atop
   // the border.
   PaintBorder(canvas);
 }
 
 void AutocompletePopupContentsView::Layout() {
   UpdateBlurRegion();
 
   // Size our children to the available content area.
   gfx::Rect contents_rect = GetContentsBounds();
-  int child_count = GetChildViewCount();
   int top = contents_rect.y();
-  for (int i = 0; i < child_count; ++i) {
+  for (int i = 0; i < child_count(); ++i) {
     View* v = GetChildViewAt(i);
     if (v->IsVisible()) {
       v->SetBounds(contents_rect.x(), top, contents_rect.width(),
                    v->GetPreferredSize().height());
       top = v->bounds().bottom();
     }
   }
 
   // We need to manually schedule a paint here since we are a layered window and
   // won't implicitly require painting until we ask for one.
@@ skipping 57 matching lines @@
 views::View* AutocompletePopupContentsView::GetViewForPoint(
     const gfx::Point& point) {
   // If there is no opt in view, then we want all mouse events. Otherwise let
   // any descendants of the opt-in view get mouse events.
   if (!opt_in_view_)
     return this;
 
   views::View* child = views::View::GetViewForPoint(point);
   views::View* ancestor = child;
   while (ancestor && ancestor != opt_in_view_)
-    ancestor = ancestor->GetParent();
+    ancestor = ancestor->parent();
   return ancestor ? child : this;
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, private:
 
 bool AutocompletePopupContentsView::HasMatchAt(size_t index) const {
   return index < model_->result().size();
 }
@@ skipping 70 matching lines @@
   edit_view_->OpenURL(url, disposition, match.transition, GURL(), index,
                       is_keyword_hint ? string16() : keyword);
 }
 
 size_t AutocompletePopupContentsView::GetIndexForPoint(
     const gfx::Point& point) {
   if (!HitTest(point))
     return AutocompletePopupModel::kNoMatch;
 
   int nb_match = model_->result().size();
-  DCHECK(nb_match <= GetChildViewCount());
+  DCHECK(nb_match <= child_count());
   for (int i = 0; i < nb_match; ++i) {
     views::View* child = GetChildViewAt(i);
     gfx::Point point_in_child_coords(point);
     View::ConvertPointToView(this, child, &point_in_child_coords);
     if (child->HitTest(point_in_child_coords))
       return i;
   }
   return AutocompletePopupModel::kNoMatch;
 }
 
@@ skipping 25 matching lines @@
   opt_in_view_ = NULL;
   PromoCounter* counter = model_->profile()->GetInstantPromoCounter();
   DCHECK(counter);
   counter->Hide();
   if (opt_in) {
     browser::ShowInstantConfirmDialogIfNecessary(
         location_bar_->GetWindow()->GetNativeWindow(), model_->profile());
   }
   UpdatePopupAppearance();
 }