Resume encryption migration immediately if the previous migration is incomplete.

chrome/browser/chromeos/login/existing_user_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 145 matching lines @@
   // Trigger public session auto-login.
   void OnPublicSessionAutoLoginTimerFire();
   // Trigger ARC kiosk auto-login.
   void OnArcKioskAutoLoginTimerFire();
 
   // LoginPerformer::Delegate implementation:
   void OnAuthFailure(const AuthFailure& error) override;
   void OnAuthSuccess(const UserContext& user_context) override;
   void OnOffTheRecordAuthSuccess() override;
   void OnPasswordChangeDetected() override;
-  void OnOldEncryptionDetected(const UserContext& user_context) override;
+  void OnOldEncryptionDetected(const UserContext& user_context,
+                               bool has_incomplete_migration) override;
   void WhiteListCheckFailed(const std::string& email) override;
   void PolicyLoadFailed() override;
   void SetAuthFlowOffline(bool offline) override;
 
   // UserSessionManagerDelegate implementation:
   void OnProfilePrepared(Profile* profile, bool browser_launched) override;
 
   // Called when device settings change.
   void DeviceSettingsChanged();
 
@@ skipping 24 matching lines @@
   // Shows "enable developer features" screen.
   void ShowEnableDebuggingScreen();
 
   // Shows kiosk feature enable screen.
   void ShowKioskEnableScreen();
 
   // Shows "kiosk auto-launch permission" screen.
   void ShowKioskAutolaunchScreen();
 
   // Shows "filesystem encryption migration" screen.
-  void ShowEncryptionMigrationScreen(const UserContext& user_context);
+  void ShowEncryptionMigrationScreen(const UserContext& user_context,
+                                     bool has_incomplete_migration);
 
   // Shows "critical TPM error" screen.
   void ShowTPMError();
 
   // Shows "password changed" dialog.
   void ShowPasswordChangedDialog();
 
   // Creates |login_performer_| if necessary and calls login() on it.
   void PerformLogin(const UserContext& user_context,
                     LoginPerformer::AuthorizationMode auth_mode);
@@ skipping 163 matching lines @@
 
   // Factory of callbacks.
   base::WeakPtrFactory<ExistingUserController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_