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

views/layout/box_layout.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 "views/layout/box_layout.h"
 
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
 #include "views/view.h"
 
@@ skipping 12 matching lines @@
 BoxLayout::~BoxLayout() {
 }
 
 void BoxLayout::Layout(View* host) {
   gfx::Rect child_area(host->GetLocalBounds());
   child_area.Inset(host->GetInsets());
   child_area.Inset(inside_border_horizontal_spacing_,
                    inside_border_vertical_spacing_);
   int x = child_area.x();
   int y = child_area.y();
-  for (int i = 0; i < host->GetChildViewCount(); ++i) {
+  for (int i = 0; i < host->child_count(); ++i) {
     View* child = host->GetChildViewAt(i);
     if (child->IsVisible()) {
       gfx::Rect bounds(x, y, child_area.width(), child_area.height());
       gfx::Size size(child->GetPreferredSize());
       if (orientation_ == kHorizontal) {
         bounds.set_width(size.width());
         x += size.width() + between_child_spacing_;
       } else {
         bounds.set_height(size.height());
         y += size.height() + between_child_spacing_;
       }
       // Clamp child view bounds to |child_area|.
       child->SetBoundsRect(bounds.Intersect(child_area));
     }
   }
 }
 
 gfx::Size BoxLayout::GetPreferredSize(View* host) {
   gfx::Rect bounds;
   int position = 0;
-  for (int i = 0; i < host->GetChildViewCount(); ++i) {
+  for (int i = 0; i < host->child_count(); ++i) {
     View* child = host->GetChildViewAt(i);
     if (child->IsVisible()) {
       gfx::Size size(child->GetPreferredSize());
       if (orientation_ == kHorizontal) {
         gfx::Rect child_bounds(position, 0, size.width(), size.height());
         bounds = bounds.Union(child_bounds);
         position += size.width();
       } else {
         gfx::Rect child_bounds(0, position, size.width(), size.height());
         bounds = bounds.Union(child_bounds);
         position += size.height();
       }
       position += between_child_spacing_;
     }
   }
   gfx::Insets insets(host->GetInsets());
   return gfx::Size(
       bounds.width() + insets.width() + 2 * inside_border_horizontal_spacing_,
       bounds.height() + insets.height() + 2 * inside_border_vertical_spacing_);
 }
 
 } // namespace views