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

views/controls/menu/submenu_view.cc

 // Copyright (c) 2010 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/controls/menu/submenu_view.h"
 
 #include "ui/gfx/canvas.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host.h"
@@ skipping 29 matching lines @@
 SubmenuView::~SubmenuView() {
   // The menu may not have been closed yet (it will be hidden, but not
   // necessarily closed).
   Close();
 
   delete scroll_view_container_;
 }
 
 int SubmenuView::GetMenuItemCount() {
   int count = 0;
-  for (int i = 0; i < GetChildViewCount(); ++i) {
+  for (int i = 0; i < child_count(); ++i) {
     if (GetChildViewAt(i)->GetID() == MenuItemView::kMenuItemViewID)
       count++;
   }
   return count;
 }
 
 MenuItemView* SubmenuView::GetMenuItemAt(int index) {
-  for (int i = 0, count = 0; i < GetChildViewCount(); ++i) {
+  for (int i = 0; i < child_count(); ++i) {
     if (GetChildViewAt(i)->GetID() == MenuItemView::kMenuItemViewID &&
-        count++ == index) {
+        i == index) {
       return static_cast<MenuItemView*>(GetChildViewAt(i));
     }
   }
   NOTREACHED();
   return NULL;
 }
 
 void SubmenuView::Layout() {
   // We're in a ScrollView, and need to set our width/height ourselves.
-  View* parent = GetParent();
-  if (!parent)
+  if (!parent())
     return;
 
   // Use our current y, unless it means part of the menu isn't visible anymore.
   int pref_height = GetPreferredSize().height();
   int new_y;
-  if (pref_height > parent->height())
-    new_y = std::max(parent->height() - pref_height, y());
+  if (pref_height > parent()->height())
+    new_y = std::max(parent()->height() - pref_height, y());
   else
     new_y = 0;
-  SetBounds(x(), new_y, parent->width(), pref_height);
+  SetBounds(x(), new_y, parent()->width(), pref_height);
 
   gfx::Insets insets = GetInsets();
   int x = insets.left();
   int y = insets.top();
   int menu_item_width = width() - insets.width();
-  for (int i = 0; i < GetChildViewCount(); ++i) {
+  for (int i = 0; i < child_count(); ++i) {
     View* child = GetChildViewAt(i);
     if (child->IsVisible()) {
       gfx::Size child_pref_size = child->GetPreferredSize();
       child->SetBounds(x, y, menu_item_width, child_pref_size.height());
       y += child_pref_size.height();
     }
   }
 }
 
 gfx::Size SubmenuView::GetPreferredSize() {
-  if (GetChildViewCount() == 0)
+  if (!has_children())
     return gfx::Size();
 
   max_accelerator_width_ = 0;
   int max_width = 0;
   int height = 0;
-  for (int i = 0; i < GetChildViewCount(); ++i) {
+  for (int i = 0; i < child_count(); ++i) {
     View* child = GetChildViewAt(i);
     gfx::Size child_pref_size = child->IsVisible() ?
         child->GetPreferredSize() : gfx::Size();
     max_width = std::max(max_width, child_pref_size.width());
     height += child_pref_size.height();
     if (child->GetID() == MenuItemView::kMenuItemViewID) {
       MenuItemView* menu = static_cast<MenuItemView*>(child);
       max_accelerator_width_ =
           std::max(max_accelerator_width_, menu->GetAcceleratorTextWidth());
     }
@@ skipping 257 matching lines @@
       item_bounds.set_height(kDropIndicatorHeight);
       return item_bounds;
 
     default:
       // Don't render anything for on.
       return gfx::Rect();
   }
 }
 
 }  // namespace views