diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 18:52:21 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-01 18:52:21 +0000 |
| commit | c1e8f9a8a1ca694525abb3c713a522b3ff769a6f (patch) | |
| tree | c1d6adb55e47cebccc1e200fe12cb5b3ceef2231 /views/controls | |
| parent | 00dc15583cd570b886f308d8389a3a9b24648114 (diff) | |
| download | chromium_src-c1e8f9a8a1ca694525abb3c713a522b3ff769a6f.zip chromium_src-c1e8f9a8a1ca694525abb3c713a522b3ff769a6f.tar.gz chromium_src-c1e8f9a8a1ca694525abb3c713a522b3ff769a6f.tar.bz2 | |
Fix crash in BookmarkMenuController::GetTooltipText that occurred
because we were passing in an id that it wasn't prepared for. This
happened if a menu had no children.
BUG=71555
TEST=see bug
Review URL: http://codereview.chromium.org/6368024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/menu/menu_item_view.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc index f555080..a4b9779 100644 --- a/views/controls/menu/menu_item_view.cc +++ b/views/controls/menu/menu_item_view.cc @@ -41,6 +41,11 @@ class EmptyMenuMenuItem : public MenuItemView { SetEnabled(false); } + virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip) { + // Empty menu items shouldn't have a tooltip. + return false; + } + private: DISALLOW_COPY_AND_ASSIGN(EmptyMenuMenuItem); }; |