Commit fcf3aa58 authored by oshima@google.com's avatar oshima@google.com

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
parent eecc60c0
...@@ -42,6 +42,10 @@ aura::Window* StackingController::GetActivatableWindow(aura::Window* window) { ...@@ -42,6 +42,10 @@ aura::Window* StackingController::GetActivatableWindow(aura::Window* window) {
while (parent) { while (parent) {
if (SupportsChildActivation(parent)) if (SupportsChildActivation(parent))
return child; 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(); parent = parent->parent();
child = child->parent(); child = child->parent();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment