summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-12 03:04:24 +0000
committerbenrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-12 03:04:24 +0000
commit822b56802b9a6649f13d8f0ab4abf365e3421472 (patch)
treede788b5896022076f1335ec44d5943244ee73da9 /ui
parentd2caaa2a67a44bc69b89aeda45752e91384dcef0 (diff)
downloadchromium_src-822b56802b9a6649f13d8f0ab4abf365e3421472.zip
chromium_src-822b56802b9a6649f13d8f0ab4abf365e3421472.tar.gz
chromium_src-822b56802b9a6649f13d8f0ab4abf365e3421472.tar.bz2
Fix loss of mouse events when an Aura combobox is open in a modal dialog.
NativeComboboxViews was not passing itself as a (transient) parent to MenuRunner::RunMenuAt. All mouse events were sent to the open menu (since it is set as the capture window), and ModalityEventFilter::PreHandleMouseEvent dropped them all since they were not directed to a child of the active modal dialog. BUG=105155 TEST=none Review URL: http://codereview.chromium.org/8893019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/controls/combobox/native_combobox_views.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/views/controls/combobox/native_combobox_views.cc b/ui/views/controls/combobox/native_combobox_views.cc
index cb5e1ce..aa8cbfa 100644
--- a/ui/views/controls/combobox/native_combobox_views.cc
+++ b/ui/views/controls/combobox/native_combobox_views.cc
@@ -361,7 +361,7 @@ void NativeComboboxViews::ShowDropDownMenu() {
dropdown_open_ = true;
if (dropdown_list_menu_runner_->RunMenuAt(
- NULL, NULL, bounds, MenuItemView::TOPLEFT,
+ GetWidget(), NULL, bounds, MenuItemView::TOPLEFT,
MenuRunner::HAS_MNEMONICS) == MenuRunner::MENU_DELETED)
return;
dropdown_open_ = false;