diff options
author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:09:25 +0000 |
---|---|---|
committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 00:09:25 +0000 |
commit | 5d432bb8e17d4de284af3f7e404ba46794ef0d3f (patch) | |
tree | 35e527ca44359e2cfabeab8f1febe58cef4f20cd /ui | |
parent | 50fae7a5eab1c5f8bf704913f2fe041a542788b1 (diff) | |
download | chromium_src-5d432bb8e17d4de284af3f7e404ba46794ef0d3f.zip chromium_src-5d432bb8e17d4de284af3f7e404ba46794ef0d3f.tar.gz chromium_src-5d432bb8e17d4de284af3f7e404ba46794ef0d3f.tar.bz2 |
Aura desktop: Fix showing menus on desktop linux_aura.
Remove what I suspect is an unnecessary hack in views that closes menus on any widget activation change. This has been ifdefed out for OS_MAC and shouldn't exist on OS_LINUX.
After consulting with sky@ about why this is there, I was asked to make sure that a window programatically grabbing activation closed other menus on OS_WIN. This case is broken with or without this code. (Try entering "setTimeout(function() {alert("ping"); }, 9001);" in the console in a different window; it doesn't close the menu either way.)
BUG=130799
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10545060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r-- | ui/views/widget/widget.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index 2231378..d665282 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -898,17 +898,9 @@ void Widget::EnableInactiveRendering() { } void Widget::OnNativeWidgetActivationChanged(bool active) { - if (!active) { + if (!active) SaveWindowPlacement(); -#if !defined(OS_MACOSX) - // Close any open menus. - MenuController* menu_controller = MenuController::GetActiveInstance(); - if (menu_controller) - menu_controller->OnWidgetActivationChanged(); -#endif // !defined(OS_MACOSX) - } - FOR_EACH_OBSERVER(Observer, observers_, OnWidgetActivationChanged(this, active)); } |