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

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

Issue 10829173: Revert 149869 because it broke ash_unittests on win_aura and linux_chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
Index: chrome/browser/chromeos/login/screen_locker.cc
===================================================================
--- chrome/browser/chromeos/login/screen_locker.cc (revision 149877)
+++ chrome/browser/chromeos/login/screen_locker.cc (working copy)
@@ -7,8 +7,6 @@
#include <string>
#include <vector>
-#include "ash/desktop_background/desktop_background_controller.h"
-#include "ash/shell.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/lazy_instance.h"
@@ -145,8 +143,6 @@
void ScreenLocker::Init() {
authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
delegate_.reset(new WebUIScreenLocker(this));
- ash::Shell::GetInstance()->
- desktop_background_controller()->MoveDesktopToLockedContainer();
delegate_->LockScreen(unlock_on_input_);
}
@@ -322,8 +318,6 @@
ScreenLocker::~ScreenLocker() {
DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
ClearErrors();
- ash::Shell::GetInstance()->
- desktop_background_controller()->MoveDesktopToUnlockedContainer();
screen_locker_ = NULL;
bool state = false;
« no previous file with comments | « chrome/browser/chromeos/login/lock_window_aura.cc ('k') | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698