Convert some more view methods to the ui/views style.

views/controls/menu/menu_item_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 "views/controls/menu/menu_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
@@ skipping 271 matching lines @@
     item->CreateSubmenu();
   submenu_->AddChildViewAt(item, index);
   return item;
 }
 
 void MenuItemView::RemoveMenuItemAt(int index) {
   DCHECK(submenu_);
   DCHECK_LE(0, index);
   DCHECK_GT(submenu_->child_count(), index);
 
-  View* item = submenu_->GetChildViewAt(index);
+  View* item = submenu_->child_at(index);
   DCHECK(item);
   submenu_->RemoveChildView(item);
 
   // RemoveChildView() does not delete the item, which is a good thing
   // in case a submenu is being displayed while items are being removed.
   // Deletion will be done by ChildrenChanged() or at destruction.
   removed_items_.push_back(item);
 }
 
 MenuItemView* MenuItemView::AppendMenuItemFromModel(ui::MenuModel* model,
@@ skipping 136 matching lines @@
   } while (index != string16::npos);
   return 0;
 }
 
 MenuItemView* MenuItemView::GetMenuItemByID(int id) {
   if (GetCommand() == id)
     return this;
   if (!HasSubmenu())
     return NULL;
   for (int i = 0; i < GetSubmenu()->child_count(); ++i) {
-    View* child = GetSubmenu()->GetChildViewAt(i);
+    View* child = GetSubmenu()->child_at(i);
     if (child->id() == MenuItemView::kMenuItemViewID) {
       MenuItemView* result = static_cast<MenuItemView*>(child)->
           GetMenuItemByID(id);
       if (result)
         return result;
     }
   }
   return NULL;
 }
 
@@ skipping 20 matching lines @@
   STLDeleteElements(&removed_items_);
 }
 
 void MenuItemView::Layout() {
   if (!has_children())
     return;
 
   if (child_count() == 1 && GetTitle().size() == 0) {
     // We only have one child and no title so let the view take over all the
     // space.
-    View* child = GetChildViewAt(0);
+    View* child = child_at(0);
     gfx::Size size = child->GetPreferredSize();
     child->SetBounds(label_start_, GetTopMargin(), size.width(), size.height());
   } else {
     // Child views are laid out right aligned and given the full height. To
     // right align start with the last view and progress to the first.
     for (int i = child_count() - 1, x = width() - item_right_margin_; i >= 0;
          --i) {
-      View* child = GetChildViewAt(i);
+      View* child = child_at(i);
       int width = child->GetPreferredSize().width();
       child->SetBounds(x - width, 0, width, height());
       x -= width - kChildXPadding;
     }
   }
 }
 
 int MenuItemView::GetAcceleratorTextWidth() {
   string16 text = GetAcceleratorText();
   return text.empty() ? 0 : GetFont().GetStringWidth(text);
@@ skipping 151 matching lines @@
         child->AddEmptyMenus();
     }
   }
 }
 
 void MenuItemView::RemoveEmptyMenus() {
   DCHECK(HasSubmenu());
   // Iterate backwards as we may end up removing views, which alters the child
   // view count.
   for (int i = submenu_->child_count() - 1; i >= 0; --i) {
-    View* child = submenu_->GetChildViewAt(i);
+    View* child = submenu_->child_at(i);
     if (child->id() == MenuItemView::kMenuItemViewID) {
       MenuItemView* menu_item = static_cast<MenuItemView*>(child);
       if (menu_item->HasSubmenu())
         menu_item->RemoveEmptyMenus();
     } else if (child->id() == EmptyMenuMenuItem::kEmptyMenuItemViewID) {
       submenu_->RemoveChildView(child);
       delete child;
       child = NULL;
     }
   }
@@ skipping 57 matching lines @@
   return root && root->has_icons_
       ? MenuConfig::instance().item_bottom_margin :
         MenuConfig::instance().item_no_icon_bottom_margin;
 }
 
 gfx::Size MenuItemView::GetChildPreferredSize() {
   if (!has_children())
     return gfx::Size();
 
   if (GetTitle().size() == 0 && child_count() == 1) {
-    View* child = GetChildViewAt(0);
+    View* child = child_at(0);
     return child->GetPreferredSize();
   }
 
   int width = 0;
   for (int i = 0; i < child_count(); ++i) {
     if (i)
       width += kChildXPadding;
-    width += GetChildViewAt(i)->GetPreferredSize().width();
+    width += child_at(i)->GetPreferredSize().width();
   }
   // Return a height of 0 to indicate that we should use the title height
   // instead.
   return gfx::Size(width, 0);
 }
 
 string16 MenuItemView::GetAcceleratorText() {
   if (id() == kEmptyMenuItemViewID) {
     // Don't query the delegate for menus that represent no children.
     return string16();
   }
 
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views