| Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| index 7678705dbb03c1847712689540dfccb20e72c551..34d350eaf666092a026076d72ae451ca4f9a1be3 100644
|
| --- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
|
| @@ -17,6 +17,7 @@
|
| #include "base/values.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/browser_process_platform_part.h"
|
| +#include "chrome/browser/chromeos/arc/arc_util.h"
|
| #include "chrome/browser/chromeos/login/lock/screen_locker.h"
|
| #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_factory.h"
|
| #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h"
|
| @@ -146,7 +147,7 @@ bool AllowFingerprintForUser(user_manager::User* user) {
|
| bool ShouldCheckNeedDircryptoMigration() {
|
| return !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableEncryptionMigration) &&
|
| - arc::IsArcAvailable();
|
| + arc::IsArcAvailable() && arc::IsArcMigrationAllowed();
|
| }
|
|
|
| // Returns true if the user can run ARC based on the user type.
|
|
|