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

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

Issue 2890843002: Policy implementation for encryptfs to ext4 migration strategy (Closed)
Patch Set: Fixed review comments 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 8e0c8c560739f467f38cac373d0ad2ce07ab331a..50361f078445da251bf623df9ef83aec22c348f4 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();
bartfab (slow) 2017/06/13 09:56:02 Can we test this?
igorcov 2017/06/16 11:13:04 Couldn't find an easy way to make this.
}
// Returns true if the user can run ARC based on the user type.

Powered by Google App Engine
This is Rietveld 408576698