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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.h

Issue 2801873007: Resume encryption migration immediately if the previous migration is incomplete. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/existing_user_controller.h
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index 9afa87da96b3134d52b37085e8b0aac8f75994ad..32f8a497364c3e69c7bb2354b48da675ea897c42 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -163,7 +163,8 @@ class ExistingUserController
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;
@@ -208,7 +209,8 @@ class ExistingUserController
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();
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698