| 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 c16da7116b32072ce65e7e46916f58fba96bba5d..e8c21da8c1c2d4e4c6e01add2c739a4a0085befc 100644
|
| --- a/chrome/browser/chromeos/login/screen_locker.cc
|
| +++ b/chrome/browser/chromeos/login/screen_locker.cc
|
| @@ -27,7 +27,6 @@
|
| #include "chrome/browser/chromeos/login/authenticator.h"
|
| #include "chrome/browser/chromeos/login/login_performer.h"
|
| #include "chrome/browser/chromeos/login/login_utils.h"
|
| -#include "chrome/browser/chromeos/login/screen_locker_views.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/browser/chromeos/login/webui_screen_locker.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| @@ -50,6 +49,10 @@
|
| #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
|
| #endif
|
|
|
| +#if !defined(USE_AURA)
|
| +#include "chrome/browser/chromeos/login/screen_locker_views.h"
|
| +#endif
|
| +
|
| using content::BrowserThread;
|
|
|
| namespace {
|
| @@ -201,10 +204,14 @@ ScreenLocker::ScreenLocker(const User& user)
|
|
|
| void ScreenLocker::Init() {
|
| authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
|
| +#if defined(USE_AURA)
|
| + delegate_.reset(new WebUIScreenLocker(this));
|
| +#else
|
| if (UseWebUILockScreen())
|
| delegate_.reset(new WebUIScreenLocker(this));
|
| else
|
| delegate_.reset(new ScreenLockerViews(this));
|
| +#endif
|
| delegate_->LockScreen(unlock_on_input_);
|
| }
|
|
|
| @@ -405,8 +412,12 @@ void ScreenLocker::UnlockScreenFailed() {
|
|
|
| // static
|
| bool ScreenLocker::UseWebUILockScreen() {
|
| +#if defined(USE_AURA)
|
| + return true;
|
| +#else
|
| return !CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableWebUILockScreen);
|
| +#endif
|
| }
|
|
|
| // static
|
|
|