diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:51:22 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:51:22 +0000 |
| commit | fcf3aa58fa480b208fe305b081e1dc673840fe92 (patch) | |
| tree | 4d1aa1d588abeefad9109c74525833b61a43e277 /ui | |
| parent | eecc60c0af77e15929e82d26cfb52311dc0e83f9 (diff) | |
| download | chromium_src-fcf3aa58fa480b208fe305b081e1dc673840fe92.zip chromium_src-fcf3aa58fa480b208fe305b081e1dc673840fe92.tar.gz chromium_src-fcf3aa58fa480b208fe305b081e1dc673840fe92.tar.bz2 | |
Fix menu crash
Made GetActivatableWindow to follow transient_parent if exists.
BUG=103820
TEST=tbd
Review URL: http://codereview.chromium.org/8523020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura_shell/stacking_controller.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/aura_shell/stacking_controller.cc b/ui/aura_shell/stacking_controller.cc index 7e297f6..2fb3ec6 100644 --- a/ui/aura_shell/stacking_controller.cc +++ b/ui/aura_shell/stacking_controller.cc @@ -42,6 +42,10 @@ aura::Window* StackingController::GetActivatableWindow(aura::Window* window) { while (parent) { if (SupportsChildActivation(parent)) return child; + // If |child| isn't activatable, but has transient parent, trace + // that path instead. + if (child->transient_parent()) + return GetActivatableWindow(child->transient_parent()); parent = parent->parent(); child = child->parent(); } |