Refactor variable name from 'screen' to 'screen_id' for better

readability in wizard_controller.

Bug: 1064271
Change-Id: I2d17c1cea86fb49a4234e3e26ce44ae3531e0479
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2128115Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Saurabh Nijhara <snijhara@google.com>
Cr-Commit-Position: refs/heads/master@{#755018}

chrome/browser/chromeos/login/wizard_controller.cc

@@ -225,17 +225,17 @@ bool CanShowHIDDetectionScreen() {
   }
 }
 
-bool IsResumableScreen(chromeos::OobeScreenId screen) {
+bool IsResumableScreen(chromeos::OobeScreenId screen_id) {
   for (const auto& resumable_screen : kResumableScreens) {
-    if (screen == resumable_screen)
+    if (screen_id == resumable_screen)
       return true;
   }
   return false;
 }
 
-bool ShouldHideStatusArea(chromeos::OobeScreenId screen) {
+bool ShouldHideStatusArea(chromeos::OobeScreenId screen_id) {
   for (const auto& s : kScreensWithHiddenStatusArea) {
-    if (screen == s)
+    if (screen_id == s)
       return true;
   }
   return false;
@@ -447,14 +447,14 @@ ErrorScreen* WizardController::GetErrorScreen() {
   return GetOobeUI()->GetErrorScreen();
 }
 
-bool WizardController::HasScreen(OobeScreenId screen) {
-  return screen_manager_->HasScreen(screen);
+bool WizardController::HasScreen(OobeScreenId screen_id) {
+  return screen_manager_->HasScreen(screen_id);
 }
 
-BaseScreen* WizardController::GetScreen(OobeScreenId screen) {
-  if (screen == ErrorScreenView::kScreenId)
+BaseScreen* WizardController::GetScreen(OobeScreenId screen_id) {
+  if (screen_id == ErrorScreenView::kScreenId)
     return GetErrorScreen();
-  return screen_manager_->GetScreen(screen);
+  return screen_manager_->GetScreen(screen_id);
 }
 
 void WizardController::SetCurrentScreenForTesting(BaseScreen* screen) {
@@ -1454,14 +1454,15 @@ void WizardController::SetCurrentScreen(BaseScreen* new_current) {
 }
 
 void WizardController::UpdateStatusAreaVisibilityForScreen(
-    OobeScreenId screen) {
-  if (screen == WelcomeView::kScreenId) {
+    OobeScreenId screen_id) {
+  if (screen_id == WelcomeView::kScreenId) {
     // Hide the status area initially; it only appears after OOBE first animates
     // in. Keep it visible if the user goes back to the existing welcome screen.
     GetLoginDisplayHost()->SetStatusAreaVisible(
         screen_manager_->HasScreen(WelcomeView::kScreenId));
   } else {
-    GetLoginDisplayHost()->SetStatusAreaVisible(!ShouldHideStatusArea(screen));
+    GetLoginDisplayHost()->SetStatusAreaVisible(
+        !ShouldHideStatusArea(screen_id));
   }
 }
 
@@ -1503,74 +1504,74 @@ void WizardController::UpdateOobeConfiguration() {
   }
 }
 
-void WizardController::AdvanceToScreen(OobeScreenId screen) {
-  if (screen == WelcomeView::kScreenId) {
+void WizardController::AdvanceToScreen(OobeScreenId screen_id) {
+  if (screen_id == WelcomeView::kScreenId) {
     ShowWelcomeScreen();
-  } else if (screen == NetworkScreenView::kScreenId) {
+  } else if (screen_id == NetworkScreenView::kScreenId) {
     ShowNetworkScreen();
-  } else if (screen == OobeScreen::SCREEN_SPECIAL_LOGIN) {
+  } else if (screen_id == OobeScreen::SCREEN_SPECIAL_LOGIN) {
     ShowLoginScreen();
-  } else if (screen == PackagedLicenseView::kScreenId) {
+  } else if (screen_id == PackagedLicenseView::kScreenId) {
     ShowPackagedLicenseScreen();
-  } else if (screen == UpdateView::kScreenId) {
+  } else if (screen_id == UpdateView::kScreenId) {
     InitiateOOBEUpdate();
-  } else if (screen == EulaView::kScreenId) {
+  } else if (screen_id == EulaView::kScreenId) {
     ShowEulaScreen();
-  } else if (screen == ResetView::kScreenId) {
+  } else if (screen_id == ResetView::kScreenId) {
     ShowResetScreen();
-  } else if (screen == KioskEnableScreenView::kScreenId) {
+  } else if (screen_id == KioskEnableScreenView::kScreenId) {
     ShowKioskEnableScreen();
-  } else if (screen == KioskAutolaunchScreenView::kScreenId) {
+  } else if (screen_id == KioskAutolaunchScreenView::kScreenId) {
     ShowKioskAutolaunchScreen();
-  } else if (screen == EnableAdbSideloadingScreenView::kScreenId) {
+  } else if (screen_id == EnableAdbSideloadingScreenView::kScreenId) {
     ShowEnableAdbSideloadingScreen();
-  } else if (screen == EnableDebuggingScreenView::kScreenId) {
+  } else if (screen_id == EnableDebuggingScreenView::kScreenId) {
     ShowEnableDebuggingScreen();
-  } else if (screen == EnrollmentScreenView::kScreenId) {
+  } else if (screen_id == EnrollmentScreenView::kScreenId) {
     ShowEnrollmentScreen();
-  } else if (screen == DemoSetupScreenView::kScreenId) {
+  } else if (screen_id == DemoSetupScreenView::kScreenId) {
     ShowDemoModeSetupScreen();
-  } else if (screen == DemoPreferencesScreenView::kScreenId) {
+  } else if (screen_id == DemoPreferencesScreenView::kScreenId) {
     ShowDemoModePreferencesScreen();
-  } else if (screen == TermsOfServiceScreenView::kScreenId) {
+  } else if (screen_id == TermsOfServiceScreenView::kScreenId) {
     ShowTermsOfServiceScreen();
-  } else if (screen == SyncConsentScreenView::kScreenId) {
+  } else if (screen_id == SyncConsentScreenView::kScreenId) {
     ShowSyncConsentScreen();
-  } else if (screen == ArcTermsOfServiceScreenView::kScreenId) {
+  } else if (screen_id == ArcTermsOfServiceScreenView::kScreenId) {
     ShowArcTermsOfServiceScreen();
-  } else if (screen == RecommendAppsScreenView::kScreenId) {
+  } else if (screen_id == RecommendAppsScreenView::kScreenId) {
     ShowRecommendAppsScreen();
-  } else if (screen == AppDownloadingScreenView::kScreenId) {
+  } else if (screen_id == AppDownloadingScreenView::kScreenId) {
     ShowAppDownloadingScreen();
-  } else if (screen == WrongHWIDScreenView::kScreenId) {
+  } else if (screen_id == WrongHWIDScreenView::kScreenId) {
     ShowWrongHWIDScreen();
-  } else if (screen == AutoEnrollmentCheckScreenView::kScreenId) {
+  } else if (screen_id == AutoEnrollmentCheckScreenView::kScreenId) {
     ShowAutoEnrollmentCheckScreen();
-  } else if (screen == AppLaunchSplashScreenView::kScreenId) {
+  } else if (screen_id == AppLaunchSplashScreenView::kScreenId) {
     AutoLaunchKioskApp();
-  } else if (screen == HIDDetectionView::kScreenId) {
+  } else if (screen_id == HIDDetectionView::kScreenId) {
     ShowHIDDetectionScreen();
-  } else if (screen == DeviceDisabledScreenView::kScreenId) {
+  } else if (screen_id == DeviceDisabledScreenView::kScreenId) {
     ShowDeviceDisabledScreen();
-  } else if (screen == EncryptionMigrationScreenView::kScreenId) {
+  } else if (screen_id == EncryptionMigrationScreenView::kScreenId) {
     ShowEncryptionMigrationScreen();
-  } else if (screen == UpdateRequiredView::kScreenId) {
+  } else if (screen_id == UpdateRequiredView::kScreenId) {
     ShowUpdateRequiredScreen();
-  } else if (screen == AssistantOptInFlowScreenView::kScreenId) {
+  } else if (screen_id == AssistantOptInFlowScreenView::kScreenId) {
     ShowAssistantOptInFlowScreen();
-  } else if (screen == MultiDeviceSetupScreenView::kScreenId) {
+  } else if (screen_id == MultiDeviceSetupScreenView::kScreenId) {
     ShowMultiDeviceSetupScreen();
-  } else if (screen == GestureNavigationScreenView::kScreenId) {
+  } else if (screen_id == GestureNavigationScreenView::kScreenId) {
     ShowGestureNavigationScreen();
-  } else if (screen == DiscoverScreenView::kScreenId) {
+  } else if (screen_id == DiscoverScreenView::kScreenId) {
     ShowDiscoverScreen();
-  } else if (screen == FingerprintSetupScreenView::kScreenId) {
+  } else if (screen_id == FingerprintSetupScreenView::kScreenId) {
     ShowFingerprintSetupScreen();
-  } else if (screen == MarketingOptInScreenView::kScreenId) {
+  } else if (screen_id == MarketingOptInScreenView::kScreenId) {
     ShowMarketingOptInScreen();
-  } else if (screen == SupervisionTransitionScreenView::kScreenId) {
+  } else if (screen_id == SupervisionTransitionScreenView::kScreenId) {
     ShowSupervisionTransitionScreen();
-  } else if (screen != OobeScreen::SCREEN_TEST_NO_WINDOW) {
+  } else if (screen_id != OobeScreen::SCREEN_TEST_NO_WINDOW) {
     if (is_out_of_box_) {
       time_oobe_started_ = base::Time::Now();
       if (CanShowHIDDetectionScreen()) {

chrome/browser/chromeos/login/wizard_controller.h

@@ -96,7 +96,7 @@ class WizardController {
   void Init(OobeScreenId first_screen);
 
   // Advances to screen defined by |screen| and shows it.
-  void AdvanceToScreen(OobeScreenId screen);
+  void AdvanceToScreen(OobeScreenId screen_id);
 
   // Starts Demo Mode setup flow. The flow starts from network screen and reuses
   // some of regular OOBE screens. It consists of the following screens:
@@ -148,10 +148,10 @@ class WizardController {
   }
 
   // Returns true if a given screen exists.
-  bool HasScreen(OobeScreenId screen);
+  bool HasScreen(OobeScreenId screen_id);
 
   // Returns a given screen. Creates it lazily.
-  BaseScreen* GetScreen(OobeScreenId screen);
+  BaseScreen* GetScreen(OobeScreenId screen_id);
 
   // Returns the current ScreenManager instance.
   ScreenManager* screen_manager() const { return screen_manager_.get(); }
@@ -289,7 +289,7 @@ class WizardController {
   void SetCurrentScreen(BaseScreen* screen);
 
   // Update the status area visibility for |screen|.
-  void UpdateStatusAreaVisibilityForScreen(OobeScreenId screen);
+  void UpdateStatusAreaVisibilityForScreen(OobeScreenId screen_id);
 
   // Launched kiosk app configured for auto-launch.
   void AutoLaunchKioskApp();