Three menu bugs:

. If a context menu was shown from a menu, then hidden we did not keep
  mouse capture and bad things happened (menu wouldn't go away when
   clicking else where, crash ...).
. We only update menu sizes on first show of a menu. That way if a
  context menu doesn't have icons things don't shift around.
. If nothing was selected in the menu pressing the context menu
  showed the context menu for the root. It doesn't make sense for the
  root menu to have a context menu.

BUG=4364
TEST=see bug

Review URL: http://codereview.chromium.org/10706

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5397 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 6 deletions

diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index 959c442..d1f4eed 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -1329,7 +1329,11 @@ void MenuItemView::PrepareForRun(bool has_mnemonics) {
 
   AddEmptyMenus();
 
-  UpdateMenuPartSizes(has_icons_);
+  if (!MenuController::GetActiveInstance()) {
+    // Only update the menu size if there are no menus showing, otherwise
+    // things may shift around.
+    UpdateMenuPartSizes(has_icons_);
+  }
 
   font_ = GetMenuFont();
 
@@ -1578,8 +1582,6 @@ MenuItemView* MenuController::Run(HWND parent,
     pending_state_.monitor_bounds = gfx::Rect(mi.rcMonitor);
   }
 
-  did_capture_ = false;
-
   any_menu_contains_mouse_ = false;
 
   // Set the selection, which opens the initial menu.
@@ -1624,6 +1626,7 @@ MenuItemView* MenuController::Run(HWND parent,
     menu_stack_.pop_back();
   } else {
     showing_ = false;
+    did_capture_ = false;
   }
 
   MenuItemView* result = result_;
@@ -2045,7 +2048,7 @@ bool MenuController::Dispatch(const MSG& msg) {
   switch (msg.message) {
     case WM_CONTEXTMENU: {
       MenuItemView* item = pending_state_.item;
-      if (item) {
+      if (item && item->GetRootMenuItem() != item) {
         gfx::Point screen_loc(0, item->height());
         View::ConvertPointToScreen(item, &screen_loc);
         item->GetDelegate()->ShowContextMenu(
diff --git a/chrome/views/chrome_menu.h b/chrome/views/chrome_menu.h
index ec31e35..a92a45c 100644
--- a/chrome/views/chrome_menu.h
+++ b/chrome/views/chrome_menu.h
@@ -635,7 +635,7 @@ class MenuController : public MessageLoopForUI::Dispatcher {
                     bool update_immediately);
 
   // Cancels the current Run. If all is true, any nested loops are canceled
-  // as well. This immediatley hides all menus.
+  // as well. This immediately hides all menus.
   void Cancel(bool all);
 
   // An alternative to Cancel(true) that can be used with a OneShotTimer.
@@ -949,4 +949,3 @@ class MenuController : public MessageLoopForUI::Dispatcher {
 }  // namespace views
 
 #endif  // CHROME_VIEWS_CHROME_MENU_H__
-