Fixes possible crash in bookmark menus. Specifically if you had a menu...

views/controls/menu/chrome_menu.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_MENU_CHROME_MENU_H_
 #define VIEWS_CONTROLS_MENU_CHROME_MENU_H_
 
 #include <list>
 #include <vector>
 
@@ skipping 696 matching lines @@
   // particular location.
   struct MenuPart {
     // Type of part.
     enum Type {
       NONE,
       MENU_ITEM,
       SCROLL_UP,
       SCROLL_DOWN
     };
 
-    MenuPart() : type(NONE), menu(NULL), submenu(NULL) {}
+    MenuPart() : type(NONE), menu(NULL), parent(NULL), submenu(NULL) {}
 
     // Convenience for testing type == SCROLL_DOWN or type == SCROLL_UP.
     bool is_scroll() const { return type == SCROLL_DOWN || type == SCROLL_UP; }
 
     // Type of part.
     Type type;
 
     // If type is MENU_ITEM, this is the menu item the mouse is over, otherwise
     // this is NULL.
     // NOTE: if type is MENU_ITEM and the mouse is not over a valid menu item
     //       but is over a menu (for example, the mouse is over a separator or
-    //       empty menu), this is NULL.
+    //       empty menu), this is NULL and parent is the menu the mouse was
+    //       clicked on.
     MenuItemView* menu;
 
+    // If type is MENU_ITEM but the mouse is not over a menu item this is the
+    // parent of the menu item the user clicked on. Otherwise this is NULL.
+    MenuItemView* parent;
+
     // If type is SCROLL_*, this is the submenu the mouse is over.
     SubmenuView* submenu;
   };
 
   // Sets the active MenuController.
   static void SetActiveInstance(MenuController* controller);
 
 #if defined(OS_WIN)
   // Dispatcher method. This returns true if the menu was canceled, or
   // if the message is such that the menu should be closed.
@@ skipping 206 matching lines @@
   // Task for scrolling the menu. If non-null indicates a scroll is currently
   // underway.
   scoped_ptr<MenuScrollTask> scroll_task_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_CHROME_MENU_H_