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

Unified Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 11016030: cros: Fix missing windows/launcher after resume/screen unlock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « ash/desktop_background/desktop_background_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index a3a369bbb497189724bc6fcb0d2bcfac7313f952..068240403bd894a0b215198bbe35391e84186e19 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -323,14 +323,8 @@ void ScreenLocker::InitClass() {
ScreenLocker::~ScreenLocker() {
DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
ClearErrors();
- bool moved = ash::Shell::GetInstance()->
+ ash::Shell::GetInstance()->
desktop_background_controller()->MoveDesktopToUnlockedContainer();
- // If we didn't reparent the desktop background then the screen would be
- // unlocked but the user's windows are hidden, making the UI unusable.
- // Similar symptoms are happening in the field. Check if this is the cause.
- // See crbug.com/149043
- CHECK(moved);
- LOG(WARNING) << "JAMESDEBUG screen locked moved " << moved;
screen_locker_ = NULL;
bool state = false;
« no previous file with comments | « ash/desktop_background/desktop_background_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698