diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 02:29:58 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 02:29:58 +0000 |
| commit | 43cb78f61e77c17ee2450f85802811c4b3af6b58 (patch) | |
| tree | 58609814383beeef25a4661aa344c4c902690ade /views/controls | |
| parent | 9241e6b6807d0528f6252d5b840e26862796c962 (diff) | |
| download | chromium_src-43cb78f61e77c17ee2450f85802811c4b3af6b58.zip chromium_src-43cb78f61e77c17ee2450f85802811c4b3af6b58.tar.gz chromium_src-43cb78f61e77c17ee2450f85802811c4b3af6b58.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/menu/menu_item_view.cc | 8 |
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 bfe1b75..df4a2a8 100644 --- a/views/controls/menu/menu_item_view.cc +++ b/views/controls/menu/menu_item_view.cc @@ -130,6 +130,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); |