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

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

Issue 2867173003: cros: Move LockWindow from chrome to ash (Closed)
Patch Set: Reorder patches so view -> ui lands first Created 3 years, 7 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 | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/login/lock/webui_screen_locker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/lock/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc
index 0d1730e08e86ce9b4f0b21de6a0a4a69c68935c2..e0b05e96e74706aa3dc4f823345f830c464ae105 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -242,16 +242,13 @@ void ScreenLocker::Init() {
owns_delegate_ = true;
// Create and display lock screen.
- // TODO(jdufualt): LockWindow should live in ash.
// TODO(jdufault): Calling ash::ShowLockScreenInWidget should be a mojo
// call. We should only set the session state to locked after the mojo call
// has completed.
- LockWindow* lock_window = new LockWindow();
- lock_window->SetBounds(
- display::Screen::GetScreen()->GetPrimaryDisplay().bounds());
- ash::ShowLockScreenInWidget(lock_window);
- session_manager::SessionManager::Get()->SetSessionState(
- session_manager::SessionState::LOCKED);
+ if (ash::ShowLockScreen()) {
+ session_manager::SessionManager::Get()->SetSessionState(
+ session_manager::SessionState::LOCKED);
+ }
} else {
web_ui_.reset(new WebUIScreenLocker(this));
delegate_ = web_ui_.get();
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/login/lock/webui_screen_locker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698