diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-25 20:42:53 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-25 20:42:53 +0000 |
| commit | 10620521ee22370e9e198123057931c5b20e591c (patch) | |
| tree | 4bab36f2400cadb367af6f4c8a64b67986fdd3ea /chrome/browser | |
| parent | 2d7c50977d163f1534cd63be7fe43568a1dda723 (diff) | |
| download | chromium_src-10620521ee22370e9e198123057931c5b20e591c.zip chromium_src-10620521ee22370e9e198123057931c5b20e591c.tar.gz chromium_src-10620521ee22370e9e198123057931c5b20e591c.tar.bz2 | |
Fixes crash from adding tooltip support to
win-aura. Widget::OnMouseEvent may block and end up deleting
DesktopNativeWidgetAura. The tooltip should be updated before the call
to Widget.
BUG=177921
TEST=covered by test
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12314099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 9301c0a..c7f1df5 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -1380,13 +1380,7 @@ class BookmarkBarViewTest16 : public BookmarkBarViewEventTestBase { } }; -#if defined(USE_AURA) && defined(OS_WIN) -// http://crbug.com/177921 -#define MAYBE_DeleteMenu DISABLED_DeleteMenu -#else -#define MAYBE_DeleteMenu DeleteMenu -#endif // defined(USE_AURA) && defined(OS_WIN) -VIEW_TEST(BookmarkBarViewTest16, MAYBE_DeleteMenu) +VIEW_TEST(BookmarkBarViewTest16, DeleteMenu) // Makes sure right clicking on an item while a context menu is already showing // doesn't crash and works. |