| Index: chrome/browser/chromeos/ui/idle_logout_dialog_view.cc
|
| diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc
|
| index 1186192ef287334b390ce1b1c0c82fd3ec5f9b51..eceea4d7c886701d3870f942a4eb7bd6f6c486d8 100644
|
| --- a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc
|
| +++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "chrome/browser/chromeos/ui/idle_logout_dialog_view.h"
|
|
|
| +#include "ash/shell.h"
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/time.h"
|
| @@ -170,8 +171,15 @@ void IdleLogoutDialogView::Show() {
|
|
|
| UpdateCountdown();
|
|
|
| - views::Widget::CreateWindow(this);
|
| - GetWidget()->SetAlwaysOnTop(true);
|
| + // If the apps list is displayed, we should show as it's child. Not doing
|
| + // so will cause the apps list to disappear.
|
| + gfx::NativeWindow app_list = ash::Shell::GetInstance()->GetAppListWindow();
|
| + if (app_list) {
|
| + views::Widget::CreateWindowWithParent(this, app_list);
|
| + } else {
|
| + views::Widget::CreateWindow(this);
|
| + GetWidget()->SetAlwaysOnTop(true);
|
| + }
|
| GetWidget()->Show();
|
|
|
| // Update countdown every 1 second.
|
|
|