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

chrome/browser/ui/views/infobars/infobar_container.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/infobars/infobar_container.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/view_ids.h"
@@ skipping 42 matching lines @@
     delegate_->InfoBarContainerSizeChanged(!completed);
 }
 
 void InfoBarContainer::RemoveDelegate(InfoBarDelegate* delegate) {
   tab_contents_->RemoveInfoBar(delegate);
 }
 
 void InfoBarContainer::PaintInfoBarArrows(gfx::Canvas* canvas,
                                           View* outer_view,
                                           int arrow_center_x) {
-  for (int i = 0; i < GetChildViewCount(); ++i) {
+  for (int i = 0; i < child_count(); ++i) {
     InfoBarView* infobar = static_cast<InfoBarView*>(GetChildViewAt(i));
     infobar->PaintArrow(canvas, outer_view, arrow_center_x);
   }
 }
 
 gfx::Size InfoBarContainer::GetPreferredSize() {
   // We do not have a preferred width (we will expand to fit the available width
   // of the delegate). Our preferred height is the sum of the preferred heights
   // of the InfoBars contained within us.
   int height = 0;
-  for (int i = 0; i < GetChildViewCount(); ++i)
+  for (int i = 0; i < child_count(); ++i)
     height += GetChildViewAt(i)->GetPreferredSize().height();
   return gfx::Size(0, height);
 }
 
 void InfoBarContainer::Layout() {
   int top = 0;
-  for (int i = 0; i < GetChildViewCount(); ++i) {
+  for (int i = 0; i < child_count(); ++i) {
     View* child = GetChildViewAt(i);
     gfx::Size ps = child->GetPreferredSize();
     child->SetBounds(0, top, width(), ps.height());
     top += ps.height();
   }
 }
 
 AccessibilityTypes::Role InfoBarContainer::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_GROUPING;
 }
 
 void InfoBarContainer::ViewHierarchyChanged(bool is_add,
                                             View* parent,
                                             View* child) {
-  if (parent == this && child->GetParent() == this) {
+  if (parent == this && child->parent() == this) {
     if (delegate_) {
       // An InfoBar child was added or removed. Tell the delegate it needs to
       // re-layout since our preferred size will have changed.
       delegate_->InfoBarContainerSizeChanged(false);
     }
   }
 }
 
 void InfoBarContainer::Observe(NotificationType type,
                                const NotificationSource& source,
@@ skipping 33 matching lines @@
     infobar->Open();
 }
 
 void InfoBarContainer::RemoveInfoBar(InfoBarDelegate* delegate,
                                      bool use_animation) {
   // Search for infobar associated with |delegate| among child views.
   // We cannot search for |delegate| in tab_contents, because an infobar remains
   // a child view until its close animation completes, which can result in
   // different number of infobars in container and infobar delegates in tab
   // contents.
-  for (int i = 0; i < GetChildViewCount(); ++i) {
+  for (int i = 0; i < child_count(); ++i) {
     InfoBarView* infobar = static_cast<InfoBarView*>(GetChildViewAt(i));
     if (infobar->delegate() == delegate) {
       if (use_animation) {
         // The View will be removed once the Close animation completes.
         infobar->AnimateClose();
       } else {
         infobar->Close();
       }
       break;
     }
   }
 }
 
 void InfoBarContainer::ReplaceInfoBar(InfoBarDelegate* old_delegate,
                                       InfoBarDelegate* new_delegate) {
   RemoveInfoBar(old_delegate, false);  // no animation
   AddInfoBar(new_delegate, false);  // no animation
 }