Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5310)

Unified Diff: chrome/browser/chromeos/ui/idle_logout_dialog_view.cc

Issue 10919083: Revert 131706 - Make idle logout window not cause the app list to disappear. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/ui/idle_logout_dialog_view.cc
===================================================================
--- chrome/browser/chromeos/ui/idle_logout_dialog_view.cc (revision 154819)
+++ chrome/browser/chromeos/ui/idle_logout_dialog_view.cc (working copy)
@@ -4,7 +4,6 @@
#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"
@@ -152,15 +151,8 @@
UpdateCountdown();
- // 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);
- }
+ views::Widget::CreateWindow(this);
+ GetWidget()->SetAlwaysOnTop(true);
GetWidget()->Show();
// Update countdown every 1 second.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698