Commit 3ed90e3f authored by xiyuan@chromium.org's avatar xiyuan@chromium.org

ash: Don't dismiss app list on bubbles.

BUG=122450
TEST=Verify fix for issue 122450.


Review URL: http://codereview.chromium.org/10071026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132260 0039d316-1c4b-4281-b951-d872f2087c98
parent 76dea1e6
......@@ -263,10 +263,15 @@ void AppList::OnWidgetClosing(views::Widget* widget) {
void AppList::OnWidgetActivationChanged(views::Widget* widget, bool active) {
DCHECK(view_->GetWidget() == widget);
if (view_ && is_visible_ && !active) {
aura::Window* self = view_->GetWidget()->GetNativeWindow();
aura::Window* applist_container = Shell::GetInstance()->GetContainer(
internal::kShellWindowId_AppListContainer);
aura::Window* bubble_container = Shell::GetInstance()->GetContainer(
internal::kShellWindowId_SettingBubbleContainer);
aura::Window* active_window = ash::wm::GetActiveWindow();
if (active_window->parent() != self->parent())
if (active_window->parent() != applist_container &&
active_window->parent() != bubble_container) {
SetVisible(false);
}
}
}
......
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