Fixes possible crash in showing bookmark menu. The problem occurred...

views/controls/menu/menu_item_view.cc

 // Copyright (c) 2006-2008 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/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
@@ skipping 147 matching lines @@
     submenu_ = new SubmenuView(this);
   return submenu_;
 }
 
 void MenuItemView::SetSelected(bool selected) {
   selected_ = selected;
   SchedulePaint();
 }
 
 void MenuItemView::SetIcon(const SkBitmap& icon, int item_id) {
-  MenuItemView* item = GetDescendantByID(item_id);
+  MenuItemView* item = GetMenuItemByID(item_id);
   DCHECK(item);
   item->SetIcon(icon);
 }
 
 void MenuItemView::SetIcon(const SkBitmap& icon) {
   icon_ = icon;
   SchedulePaint();
 }
 
 void MenuItemView::Paint(gfx::Canvas* canvas) {
@@ skipping 30 matching lines @@
     index = title.find('&', index);
     if (index != std::wstring::npos) {
       if (index + 1 != title.size() && title[index + 1] != '&')
         return title[index + 1];
       index++;
     }
   } while (index != std::wstring::npos);
   return 0;
 }
 
+MenuItemView* MenuItemView::GetMenuItemByID(int id) {
+  if (GetCommand() == id)
+    return this;
+  if (!HasSubmenu())
+    return NULL;
+  for (int i = 0; i < GetSubmenu()->GetChildViewCount(); ++i) {
+    View* child = GetSubmenu()->GetChildViewAt(i);
+    if (child->GetID() == MenuItemView::kMenuItemViewID) {
+      MenuItemView* result = static_cast<MenuItemView*>(child)->
+          GetMenuItemByID(id);
+      if (result)
+        return result;
+    }
+  }
+  return NULL;
+}
+
 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 55 matching lines @@
     item->SetTitle(GetDelegate()->GetLabel(item_id));
   else
     item->SetTitle(label);
   item->SetIcon(icon);
   if (type == SUBMENU)
     item->CreateSubmenu();
   submenu_->AddChildView(item);
   return item;
 }
 
-MenuItemView* MenuItemView::GetDescendantByID(int id) {
-  if (GetCommand() == id)
-    return this;
-  if (!HasSubmenu())
-    return NULL;
-  for (int i = 0; i < GetSubmenu()->GetChildViewCount(); ++i) {
-    View* child = GetSubmenu()->GetChildViewAt(i);
-    if (child->GetID() == MenuItemView::kMenuItemViewID) {
-      MenuItemView* result = static_cast<MenuItemView*>(child)->
-          GetDescendantByID(id);
-      if (result)
-        return result;
-    }
-  }
-  return NULL;
-}
-
 void MenuItemView::DropMenuClosed(bool notify_delegate) {
   DCHECK(controller_);
   DCHECK(!controller_->IsBlockingRun());
   if (MenuController::GetActiveInstance() == controller_)
     MenuController::SetActiveInstance(NULL);
   delete controller_;
   controller_ = NULL;
 
   RemoveEmptyMenus();
 
@@ skipping 94 matching lines @@
 }
 
 int MenuItemView::GetBottomMargin() {
   MenuItemView* root = GetRootMenuItem();
   return root && root->has_icons_
       ? MenuConfig::instance().item_bottom_margin :
         MenuConfig::instance().item_no_icon_bottom_margin;
 }
 
 }  // namespace views