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

Unified Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 2890843002: Policy implementation for encryptfs to ext4 migration strategy (Closed)
Patch Set: Merge done Created 3 years, 6 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/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 47ff013c519b9ccfa1e905ce7b066bdfea659fa5..c476c454f3f276ff290535df61e947a35dee276f 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -18,6 +18,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"
@@ -149,7 +150,7 @@ bool AllowFingerprintForUser(const 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.

Powered by Google App Engine
This is Rietveld 408576698