Makes it so child views of menuitemview can be traversed with the

views/controls/menu/menu_item_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/menu_item_view.h"
 
 #include "app/l10n_util.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
@@ skipping 20 matching lines @@
     SetID(kEmptyMenuItemViewID);
     SetEnabled(false);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyMenuMenuItem);
 };
 
 }  // namespace
 
+// Padding between child views.
+static const int kChildXPadding = 8;
+
 // MenuItemView ---------------------------------------------------------------
 
-//  static
+// static
 const int MenuItemView::kMenuItemViewID = 1001;
 
 // static
 const int MenuItemView::kEmptyMenuItemViewID =
     MenuItemView::kMenuItemViewID + 1;
 
 // static
 bool MenuItemView::allow_task_nesting_during_run_ = false;
 
 // static
@@ skipping 103 matching lines @@
   controller_->Run(parent, NULL, this, bounds, anchor, NULL);
 }
 
 void MenuItemView::Cancel() {
   if (controller_ && !canceled_) {
     canceled_ = true;
     controller_->Cancel(MenuController::EXIT_ALL);
   }
 }
 
+MenuItemView* MenuItemView::AppendMenuItemImpl(int item_id,
+                                               const std::wstring& label,
+                                               const SkBitmap& icon,
+                                               Type type) {
+  if (!submenu_)
+    CreateSubmenu();
+  if (type == SEPARATOR) {
+    submenu_->AddChildView(new MenuSeparator());
+    return NULL;
+  }
+  MenuItemView* item = new MenuItemView(this, item_id, type);
+  if (label.empty() && GetDelegate())
+    item->SetTitle(GetDelegate()->GetLabel(item_id));
+  else
+    item->SetTitle(label);
+  item->SetIcon(icon);
+  if (type == SUBMENU)
+    item->CreateSubmenu();
+  submenu_->AddChildView(item);
+  return item;
+}
+
 SubmenuView* MenuItemView::CreateSubmenu() {
   if (!submenu_)
     submenu_ = new SubmenuView(this);
   return submenu_;
 }
 
 void MenuItemView::SetSelected(bool selected) {
   selected_ = selected;
   SchedulePaint();
 }
@@ skipping 88 matching lines @@
 
   if (submenu_) {
     // Force a paint and layout. This handles the case of the top level window's
     // size remaining the same, resulting in no change to the submenu's size and
     // no layout.
     submenu_->Layout();
     submenu_->SchedulePaint();
   }
 }
 
+void MenuItemView::Layout() {
+  int child_count = GetChildViewCount();
+  if (child_count == 0)
+    return;
+
+  // Child views are layed 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);
+    int width = child->GetPreferredSize().width();
+    child->SetBounds(x - width, 0, width, height());
+    x -= width - kChildXPadding;
+  }
+}
+
 MenuItemView::MenuItemView(MenuItemView* parent,
                            int command,
                            MenuItemView::Type type) {
   Init(parent, command, type, NULL);
 }
 
 // Calculates all sizes that we can from the OS.
 //
 // This is invoked prior to Running a menu.
 void MenuItemView::UpdateMenuPartSizes(bool has_icons) {
@@ skipping 33 matching lines @@
   submenu_ = NULL;
   // Assign our ID, this allows SubmenuItemView to find MenuItemViews.
   SetID(kMenuItemViewID);
   has_icons_ = false;
 
   MenuDelegate* root_delegate = GetDelegate();
   if (root_delegate)
     SetEnabled(root_delegate->IsCommandEnabled(command));
 }
 
-MenuItemView* MenuItemView::AppendMenuItemInternal(int item_id,
-                                                   const std::wstring& label,
-                                                   const SkBitmap& icon,
-                                                   Type type) {
-  if (!submenu_)
-    CreateSubmenu();
-  if (type == SEPARATOR) {
-    submenu_->AddChildView(new MenuSeparator());
-    return NULL;
-  }
-  MenuItemView* item = new MenuItemView(this, item_id, type);
-  if (label.empty() && GetDelegate())
-    item->SetTitle(GetDelegate()->GetLabel(item_id));
-  else
-    item->SetTitle(label);
-  item->SetIcon(icon);
-  if (type == SUBMENU)
-    item->CreateSubmenu();
-  submenu_->AddChildView(item);
-  return item;
-}
-
 void MenuItemView::DropMenuClosed(bool notify_delegate) {
   DCHECK(controller_);
   DCHECK(!controller_->IsBlockingRun());
   if (MenuController::GetActiveInstance() == controller_)
     MenuController::SetActiveInstance(NULL);
   delete controller_;
   controller_ = NULL;
 
   RemoveEmptyMenus();
 
@@ skipping 67 matching lines @@
     } else if (child->GetID() == EmptyMenuMenuItem::kEmptyMenuItemViewID) {
       submenu_->RemoveChildView(child);
     }
   }
 }
 
 void MenuItemView::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
   rect->set_x(MirroredLeftPointForRect(*rect));
 }
 
-
 void MenuItemView::DestroyAllMenuHosts() {
   if (!HasSubmenu())
     return;
 
   submenu_->Close();
   for (int i = 0, item_count = submenu_->GetMenuItemCount(); i < item_count;
        ++i) {
     submenu_->GetMenuItemAt(i)->DestroyAllMenuHosts();
   }
 }
 
 int MenuItemView::GetTopMargin() {
   MenuItemView* root = GetRootMenuItem();
   return root && root->has_icons_
       ? MenuConfig::instance().item_top_margin :
         MenuConfig::instance().item_no_icon_top_margin;
 }
 
 int MenuItemView::GetBottomMargin() {
   MenuItemView* root = GetRootMenuItem();
   return root && root->has_icons_
       ? MenuConfig::instance().item_bottom_margin :
         MenuConfig::instance().item_no_icon_bottom_margin;
 }
 
+int MenuItemView::GetChildPreferredWidth() {
+  int child_count = GetChildViewCount();
+  if (child_count == 0)
+    return 0;
+
+  int width = 0;
+  for (int i = 0; i < child_count; ++i) {
+    if (i)
+      width += kChildXPadding;
+    width += GetChildViewAt(i)->GetPreferredSize().width();
+  }
+  return width;
+}
+
 }  // namespace views