Make idle logout window not cause the app list to disappear.

chrome/browser/chromeos/ui/idle_logout_dialog_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 146 matching lines @@
 void IdleLogoutDialogView::Show() {
   KioskModeSettings* settings =
         IdleLogoutDialogView::provider_->GetKioskModeSettings();
 
   // Setup the countdown label before showing.
   countdown_end_time_ = base::Time::Now() +
       settings->GetIdleLogoutWarningDuration();
 
   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.
   timer_.Start(FROM_HERE,
                IdleLogoutDialogView::provider_->GetCountdownUpdateInterval(),
                this,
                &IdleLogoutDialogView::UpdateCountdown);
 }
 
 void IdleLogoutDialogView::Close() {
@@ skipping 33 matching lines @@
   return g_instance;
 }
 
 // static
 void IdleLogoutDialogView::set_settings_provider(
     IdleLogoutSettingsProvider* provider) {
   provider_ = provider;
 }
 
 }  // namespace chromeos