diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 15:38:32 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 15:38:32 +0000 |
| commit | 86b96f011269b5f697cedae35596314fa844687c (patch) | |
| tree | c90e2849160dfa6918ed9ed2736441fd58c00675 /views/controls | |
| parent | 1c109b24f0415aed8f313c9fcce7514f37022c06 (diff) | |
| download | chromium_src-86b96f011269b5f697cedae35596314fa844687c.zip chromium_src-86b96f011269b5f697cedae35596314fa844687c.tar.gz chromium_src-86b96f011269b5f697cedae35596314fa844687c.tar.bz2 | |
Fix context menus for touchui=1
Nested tasks are generally allowed for context menus (e.g. in
MenuController::Run, NativeMenuDOMUI::RunMenuAt). Do the same here. This fixes a
X-freeze caused by context menus when touchui=1 with the X message-pump.
BUG=none
TEST=manual, context menus in web-pages should work and not freeze X.
Review URL: http://codereview.chromium.org/5206002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/menu/native_menu_gtk.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc index a0b2b0a..3aa6c3e 100644 --- a/views/controls/menu/native_menu_gtk.cc +++ b/views/controls/menu/native_menu_gtk.cc @@ -124,7 +124,7 @@ void NativeMenuGtk::RunMenuAt(const gfx::Point& point, int alignment) { G_CALLBACK(OnMenuMoveCurrentThunk), this); // Block until menu is no longer shown by running a nested message loop. - nested_dispatcher_ = new NestedDispatcherGtk(this, false); + nested_dispatcher_ = new NestedDispatcherGtk(this, true); bool deleted = nested_dispatcher_->RunAndSelfDestruct(); if (deleted) { // The menu was destryed while menu is shown, so return immediately. |