Mark unused screen exit codes as deprecated

Also, removes the code that supports them.

Affected exit codes:
  * USER_IMAGE_SELECTED
    * user image screen has been removed from (in
      session) OOBE, and will be added to discover screen, which means,
      wizard controller does not have to handle the screen exit code
      any longer
  * ENCRYPTION_MIGRATION_FINISHED
    ENCRYPTION_MIGRATION_SKIPPED
    * Encryption migration screen is not reporting result to wizard
      controller (instead it provides interface to add callbacks to be
      called upon completion)
  * CONNECTION_FAILED
    * Not used anywhere

While here, remove HIDDetectionScreen::Delegate, as HIDDetectionScreen
is not callign into the delegate anymore.

BUG=930267

Change-Id: I03d3b28270967032fa66db29e4a4ac9e2d64655f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1501092
Commit-Queue: Toni Baržić <tbarzic@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637943}

chrome/browser/chromeos/login/screens/encryption_migration_screen.cc

@@ -37,10 +37,6 @@ void EncryptionMigrationScreen::Hide() {
     view_->Hide();
 }
 
-void EncryptionMigrationScreen::OnExit() {
-  Finish(ScreenExitCode::ENCRYPTION_MIGRATION_FINISHED);
-}
-
 void EncryptionMigrationScreen::OnViewDestroyed(
     EncryptionMigrationScreenView* view) {
   if (view_ == view)

chrome/browser/chromeos/login/screens/encryption_migration_screen.h

@@ -30,7 +30,6 @@ class EncryptionMigrationScreen
   void Hide() override;
 
   // EncryptionMigrationScreenView::Delegate implementation:
-  void OnExit() override;
   void OnViewDestroyed(EncryptionMigrationScreenView* view) override;
 
   // Sets the UserContext for a user whose cryptohome should be migrated.

chrome/browser/chromeos/login/screens/encryption_migration_screen_view.h

@@ -22,9 +22,6 @@ class EncryptionMigrationScreenView {
    public:
     virtual ~Delegate() {}
 
-    // Called when screen is exited.
-    virtual void OnExit() = 0;
-
     // This method is called, when view is being destroyed. Note, if Delegate is
     // destroyed earlier then it has to call SetDelegate(NULL).
     virtual void OnViewDestroyed(EncryptionMigrationScreenView* view) = 0;

chrome/browser/chromeos/login/screens/hid_detection_screen.h

@@ -48,12 +48,6 @@ class HIDDetectionScreen : public BaseScreen,
   using InputDeviceInfoPtr = device::mojom::InputDeviceInfoPtr;
   using DeviceMap = std::map<std::string, InputDeviceInfoPtr>;
 
-  class Delegate {
-   public:
-    virtual ~Delegate() {}
-    virtual void OnHIDScreenNecessityCheck(bool screen_needed) = 0;
-  };
-
   HIDDetectionScreen(BaseScreenDelegate* base_screen_delegate,
                      HIDDetectionView* view);
   ~HIDDetectionScreen() override;

chrome/browser/chromeos/login/screens/screen_exit_code.cc

@@ -14,7 +14,7 @@ std::string ExitCodeToString(ScreenExitCode code) {
       return "WELCOME_CONTINUED";
     case ScreenExitCode::HID_DETECTION_COMPLETED:
       return "HID_DETECTION_COMPLETED";
-    case ScreenExitCode::CONNECTION_FAILED:
+    case ScreenExitCode::DEPRECATED_CONNECTION_FAILED:
       return "CONNECTION_FAILED";
     case ScreenExitCode::DEPRECATED_UPDATE_INSTALLED:
       return "UPDATE_INSTALLED";
@@ -24,7 +24,7 @@ std::string ExitCodeToString(ScreenExitCode code) {
       return "UPDATE_ERROR_CHECKING_FOR_UPDATE";
     case ScreenExitCode::DEPRECATED_UPDATE_ERROR_UPDATING:
       return "UPDATE_ERROR_UPDATING";
-    case ScreenExitCode::USER_IMAGE_SELECTED:
+    case ScreenExitCode::DEPRECATED_USER_IMAGE_SELECTED:
       return "USER_IMAGE_SELECTED";
     case ScreenExitCode::DEPRECATED_EULA_ACCEPTED:
       return "EULA_ACCEPTED";

chrome/browser/chromeos/login/screens/screen_exit_code.h

@@ -23,7 +23,7 @@ enum class ScreenExitCode {
   WELCOME_CONTINUED = 0,
   HID_DETECTION_COMPLETED = 1,
   // Connection failed while trying to load a WebPageScreen.
-  CONNECTION_FAILED = 2,
+  DEPRECATED_CONNECTION_FAILED = 2,
   DEPRECATED_UPDATE_INSTALLED = 3,
   // This exit code means EITHER that there was no update, OR that there
   // was an update, but that it was not a "critical" update. "Critical" updates
@@ -31,7 +31,7 @@ enum class ScreenExitCode {
   DEPRECATED_UPDATE_NOUPDATE = 4,
   DEPRECATED_UPDATE_ERROR_CHECKING_FOR_UPDATE = 5,
   DEPRECATED_UPDATE_ERROR_UPDATING = 6,
-  USER_IMAGE_SELECTED = 7,
+  DEPRECATED_USER_IMAGE_SELECTED = 7,
   DEPRECATED_EULA_ACCEPTED = 8,
   DEPRECATED_EULA_BACK = 9,
   DEPRECATED_ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED = 10,
@@ -49,8 +49,8 @@ enum class ScreenExitCode {
   ARC_TERMS_OF_SERVICE_SKIPPED = 23,
   ARC_TERMS_OF_SERVICE_ACCEPTED = 24,
   DEPRECATED_UPDATE_ERROR_UPDATING_CRITICAL_UPDATE = 25,
-  ENCRYPTION_MIGRATION_FINISHED = 26,
-  ENCRYPTION_MIGRATION_SKIPPED = 27,
+  DEPRECATED_ENCRYPTION_MIGRATION_FINISHED = 26,
+  DEPRECATED_ENCRYPTION_MIGRATION_SKIPPED = 27,
   SYNC_CONSENT_FINISHED = 32,
   DEMO_MODE_SETUP_FINISHED = 33,
   DEMO_MODE_SETUP_CANCELED = 34,

chrome/browser/chromeos/login/screens/user_image_screen.cc

@@ -353,7 +353,6 @@ void UserImageScreen::ExitScreen() {
   sync_timer_.reset();
   if (UserImageSyncObserver* sync_observer = GetSyncObserver())
     sync_observer->RemoveObserver(this);
-  Finish(ScreenExitCode::USER_IMAGE_SELECTED);
 }
 
 void UserImageScreen::ReportSyncResult(SyncResult timed_out) const {

chrome/browser/chromeos/login/wizard_controller.cc

@@ -55,6 +55,7 @@
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
 #include "chrome/browser/chromeos/login/screens/fingerprint_setup_screen.h"
+#include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
 #include "chrome/browser/chromeos/login/screens/hid_detection_view.h"
 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h"
 #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen.h"
@@ -69,7 +70,6 @@
 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h"
 #include "chrome/browser/chromeos/login/screens/update_required_screen.h"
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
-#include "chrome/browser/chromeos/login/screens/user_image_screen.h"
 #include "chrome/browser/chromeos/login/screens/welcome_view.h"
 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
@@ -386,8 +386,6 @@ std::unique_ptr<BaseScreen> WizardController::CreateScreen(OobeScreen screen) {
         this, oobe_ui->GetUpdateView(),
         base::BindRepeating(&WizardController::OnUpdateScreenExit,
                             weak_factory_.GetWeakPtr()));
-  } else if (screen == OobeScreen::SCREEN_USER_IMAGE_PICKER) {
-    return std::make_unique<UserImageScreen>(this, oobe_ui->GetUserImageView());
   } else if (screen == OobeScreen::SCREEN_OOBE_EULA) {
     return std::make_unique<EulaScreen>(
         this, oobe_ui->GetEulaView(),
@@ -516,15 +514,6 @@ void WizardController::ShowPreviousScreen() {
   SetCurrentScreen(previous_screen_);
 }
 
-void WizardController::ShowUserImageScreen() {
-  VLOG(1) << "Showing user image screen.";
-  // Status area has been already shown at sign in screen so it
-  // doesn't make sense to hide it here and then show again at user session as
-  // this produces undesired UX transitions.
-  UpdateStatusAreaVisibilityForScreen(OobeScreen::SCREEN_USER_IMAGE_PICKER);
-  SetCurrentScreen(GetScreen(OobeScreen::SCREEN_USER_IMAGE_PICKER));
-}
-
 void WizardController::ShowEulaScreen() {
   VLOG(1) << "Showing EULA screen.";
   UpdateStatusAreaVisibilityForScreen(OobeScreen::SCREEN_OOBE_EULA);
@@ -933,11 +922,6 @@ void WizardController::OnWelcomeContinued() {
   ShowNetworkScreen();
 }
 
-void WizardController::OnConnectionFailed() {
-  // TODO(dpolukhin): show error message after login screen is displayed.
-  ShowLoginScreen(LoginScreenContext());
-}
-
 void WizardController::OnChangedMetricsReportingState(bool enabled) {
   StatsReportingController::Get()->SetEnabled(
       ProfileManager::GetActiveUserProfile(), enabled);
@@ -950,10 +934,6 @@ void WizardController::OnChangedMetricsReportingState(bool enabled) {
 #endif
 }
 
-void WizardController::OnUserImageSelected() {
-  OnOobeFlowFinished();
-}
-
 void WizardController::OnDeviceModificationCanceled() {
   if (previous_screen_) {
     SetCurrentScreen(previous_screen_);
@@ -1356,8 +1336,6 @@ void WizardController::AdvanceToScreen(OobeScreen screen) {
     ShowLoginScreen(LoginScreenContext());
   } else if (screen == OobeScreen::SCREEN_OOBE_UPDATE) {
     InitiateOOBEUpdate();
-  } else if (screen == OobeScreen::SCREEN_USER_IMAGE_PICKER) {
-    ShowUserImageScreen();
   } else if (screen == OobeScreen::SCREEN_OOBE_EULA) {
     ShowEulaScreen();
   } else if (screen == OobeScreen::SCREEN_OOBE_RESET) {
@@ -1456,12 +1434,6 @@ void WizardController::OnExit(ScreenExitCode exit_code) {
     case ScreenExitCode::WELCOME_CONTINUED:
       OnWelcomeContinued();
       break;
-    case ScreenExitCode::CONNECTION_FAILED:
-      OnConnectionFailed();
-      break;
-    case ScreenExitCode::USER_IMAGE_SELECTED:
-      OnUserImageSelected();
-      break;
     case ScreenExitCode::ENABLE_DEBUGGING_CANCELED:
       OnDeviceModificationCanceled();
       break;

chrome/browser/chromeos/login/wizard_controller.h

@@ -25,6 +25,7 @@
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
+#include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
@@ -51,8 +52,7 @@ struct TimeZoneResponseData;
 // Class that manages control flow between wizard screens. Wizard controller
 // interacts with screen controllers to move the user between screens.
 class WizardController : public BaseScreenDelegate,
-                         public WelcomeScreen::Delegate,
-                         public HIDDetectionScreen::Delegate {
+                         public WelcomeScreen::Delegate {
  public:
   WizardController();
   ~WizardController() override;
@@ -118,10 +118,6 @@ class WizardController : public BaseScreenDelegate,
   // Skip update, go straight to enrollment after EULA is accepted.
   void SkipUpdateEnrollAfterEula();
 
-  // TODO(antrim) : temporary hack. Should be removed once screen system is
-  // reworked at hackaton.
-  void EnableUserImageScreenReturnToPreviousHack();
-
   // Returns current DemoSetupController if demo setup flow is in progress or
   // nullptr otherwise.
   DemoSetupController* demo_setup_controller() const {
@@ -158,7 +154,6 @@ class WizardController : public BaseScreenDelegate,
   // Show specific screen.
   void ShowWelcomeScreen();
   void ShowNetworkScreen();
-  void ShowUserImageScreen();
   void ShowEulaScreen();
   void ShowEnrollmentScreen();
   void ShowDemoModeSetupScreen();
@@ -207,8 +202,6 @@ class WizardController : public BaseScreenDelegate,
   void OnEnrollmentDone();
   void OnHIDDetectionCompleted();
   void OnWelcomeContinued();
-  void OnConnectionFailed();
-  void OnUserImageSelected();
   void OnDeviceModificationCanceled();
   void OnKioskAutolaunchCanceled();
   void OnKioskAutolaunchConfirmed();
@@ -229,7 +222,6 @@ class WizardController : public BaseScreenDelegate,
   void OnDemoSetupCanceled();
   void OnDemoPreferencesContinued();
   void OnDemoPreferencesCanceled();
-  void OnWaitForContainerReadyFinished();
   void OnSupervisionTransitionFinished();
   void OnAssistantOptInFlowFinished();
   void OnMultiDeviceSetupFinished();
@@ -267,8 +259,7 @@ class WizardController : public BaseScreenDelegate,
   // Override from WelcomeScreen::Delegate:
   void OnEnableDebuggingScreenRequested() override;
 
-  // Override from HIDDetectionScreen::Delegate
-  void OnHIDScreenNecessityCheck(bool screen_needed) override;
+  void OnHIDScreenNecessityCheck(bool screen_needed);
 
   // Notification of a change in the state of an accessibility setting.
   void OnAccessibilityStatusChanged(