diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 16:23:05 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 16:23:05 +0000 |
| commit | f77c468b6ffdc8fd49299f7b914220368758a951 (patch) | |
| tree | 1e6ec9b20e941af7f20383c0b5871b909c5f5178 /views/controls/menu/menu_host.h | |
| parent | eeb4e4a8796ee1eb0041f230a06bdfb5e37572b1 (diff) | |
| download | chromium_src-f77c468b6ffdc8fd49299f7b914220368758a951.zip chromium_src-f77c468b6ffdc8fd49299f7b914220368758a951.tar.gz chromium_src-f77c468b6ffdc8fd49299f7b914220368758a951.tar.bz2 | |
Fixes regression from menu refactoring. The old windows code wasn't
correctly listening to capture change, so that once I wired it up it
exposed a bug. I need to suppress capture change notification when
hiding a menu, otherwise it prematurely triggers cancelling menus.
BUG=89594
TEST=see bug, also covered by automated tests now.
R=oshima@chromium.org
Review URL: http://codereview.chromium.org/7390032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_host.h')
| -rw-r--r-- | views/controls/menu/menu_host.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/menu/menu_host.h b/views/controls/menu/menu_host.h index 0b5417b..3edffb2 100644 --- a/views/controls/menu/menu_host.h +++ b/views/controls/menu/menu_host.h @@ -73,8 +73,8 @@ class MenuHost : public Widget { // If true, DestroyMenuHost has been invoked. bool destroying_; - // If true, we're attempting to Show. - bool showing_; + // If true and capture is lost we don't notify the delegate. + bool ignore_capture_lost_; DISALLOW_COPY_AND_ASSIGN(MenuHost); }; |