Chromium Code Reviews| Index: chrome/browser/chromeos/login/existing_user_controller.cc |
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc |
| index 9a051eda58514c4bf1478935f02f9e1335c4bf70..66bb6fa8c36f32ed200a501319488ccee33c9565 100644 |
| --- a/chrome/browser/chromeos/login/existing_user_controller.cc |
| +++ b/chrome/browser/chromeos/login/existing_user_controller.cc |
| @@ -22,6 +22,7 @@ |
| #include "chrome/browser/browser_process_platform_part.h" |
| #include "chrome/browser/chrome_notification_types.h" |
| #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" |
| +#include "chrome/browser/chromeos/arc/arc_util.h" |
| #include "chrome/browser/chromeos/boot_times_recorder.h" |
| #include "chrome/browser/chromeos/customization/customization_document.h" |
| #include "chrome/browser/chromeos/login/arc_kiosk_controller.h" |
| @@ -189,6 +190,11 @@ bool ShouldForceDircrypto(const AccountId& account_id) { |
| if (!arc::IsArcAvailable()) |
| return false; |
| + // If the device requires ecryptfs to ext4 migration policy check, and the |
| + // policy doesn't allow the migration, then return. |
| + if (!arc::IsArcMigrationAllowed()) |
|
bartfab (slow)
2017/06/13 09:56:02
Can we test this?
|
| + return false; |
| + |
| // In some login flows (e.g. when siging in supervised user), ARC can not |
| // start. For such cases, we don't need to force Ext4 dircrypto. |
| chromeos::UserFlow* user_flow = |