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

views/controls/menu/chrome_menu.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/chrome_menu.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 
@@ skipping 1772 matching lines @@
     // event.
     RepostEvent(source, event);
 
     // And close.
     Cancel(true);
     return;
   }
 
   bool open_submenu = false;
   if (!part.menu) {
-    part.menu = source->GetMenuItem();
+    part.menu = part.parent;
     open_submenu = true;
   } else {
     if (part.menu->GetDelegate()->CanDrag(part.menu)) {
       possible_drag_ = true;
       press_x_ = event.x();
       press_y_ = event.y();
     }
     if (part.menu->HasSubmenu())
       open_submenu = true;
   }
@@ skipping 528 matching lines @@
     part->submenu = menu;
     return true;
   }
 
   // Not over the scroll button. Check the actual menu.
   if (DoesSubmenuContainLocation(menu, screen_loc)) {
     gfx::Point menu_loc = screen_loc;
     View::ConvertPointToView(NULL, menu, &menu_loc);
     part->menu = GetMenuItemAt(menu, menu_loc.x(), menu_loc.y());
     part->type = MenuPart::MENU_ITEM;
+    if (!part->menu)
+      part->parent = menu->GetMenuItem();
     return true;
   }
 
   // While the mouse isn't over a menu item or the scroll buttons of menu, it
   // is contained by menu and so we return true. If we didn't return true other
   // menus would be searched, even though they are likely obscured by us.
   return true;
 }
 
 bool MenuController::DoesSubmenuContainLocation(SubmenuView* submenu,
@@ skipping 467 matching lines @@
   if (!scroll_task_.get())
     scroll_task_.reset(new MenuScrollTask());
   scroll_task_->Update(part);
 }
 
 void MenuController::StopScrolling() {
   scroll_task_.reset(NULL);
 }
 
 }  // namespace views