Merge 97975 - Reapplies code that fixed 90860 without debugging code. This is the

same as you reviewed at http://codereview.chromium.org/7631048 minus
debugging code. As mentioned in revert cl I'm going this route so that
I can get a clean cl to apply to the 14 branch. As this is the same as
the last patch I'm TBRing.

BUG=90860
TEST=none
TBR=ben@chromium.org
R=ben@chromium.org

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

TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/7753004

git-svn-id: svn://svn.chromium.org/chrome/branches/835/src@98241 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index ea49ab6..9dc4df2 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -125,6 +125,14 @@ bool MenuItemView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
     return false;
   }
 
+  MenuItemView* root_menu_item = GetRootMenuItem();
+  if (root_menu_item->canceled_) {
+    // TODO(sky): if |canceled_| is true, controller->exit_type() should be
+    // something other than EXIT_NONE, but crash reports seem to indicate
+    // otherwise. Figure out why this is needed.
+    return false;
+  }
+
   CHECK(GetDelegate());
   gfx::Point location(p);
   ConvertPointToScreen(this, &location);