Add switch for recommend apps screen in OOBE.

This screen should show after the user accepts ARC terms of service.

Bug: 835029
Change-Id: Ib17cc71e5c322cbe48fa824c299d5269d30226c1
Reviewed-on: https://chromium-review.googlesource.com/1111334
Commit-Queue: Yue Cen <rsgingerrs@chromium.org>
Reviewed-by: Wenzhao (Colin) Zang <wzang@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575119}

chrome/browser/chromeos/login/wizard_controller.cc

@@ -245,6 +245,12 @@ bool NetworkAllowUpdate(const chromeos::NetworkState* network) {
   return true;
 }
 
+// Return true if the switch for recommend app screen is on.
+bool ShouldShowRecommendAppsScreen() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kEnableOobeRecommendAppsScreen);
+}
+
 }  // namespace
 
 namespace chromeos {
@@ -634,7 +640,6 @@ void WizardController::ShowArcTermsOfServiceScreen() {
 }
 
 void WizardController::ShowRecommendAppsScreen() {
-  // TODO(rsgingerrs): should maybe check if ToS has been accepted
   VLOG(1) << "Showing Recommend Apps screen.";
   UpdateStatusAreaVisibilityForScreen(OobeScreen::SCREEN_RECOMMEND_APPS);
   SetCurrentScreen(GetScreen(OobeScreen::SCREEN_RECOMMEND_APPS));
@@ -957,9 +962,15 @@ void WizardController::OnArcTermsOfServiceAccepted() {
     ShowWaitForContainerReadyScreen();
     return;
   }
-  // If the user finished with the PlayStore Terms of Service, advance to the
+
+  // If the switch for recommend app screen is on, show it after the user
+  // finished with the PlayStore Terms of Service. Otherwise, advance to the
   // user image screen.
-  ShowUserImageScreen();
+  if (ShouldShowRecommendAppsScreen()) {
+    ShowRecommendAppsScreen();
+  } else {
+    ShowUserImageScreen();
+  }
 }
 
 void WizardController::OnRecommendAppsSkipped() {

chromeos/chromeos_switches.cc

@@ -347,6 +347,10 @@ const char kEnableNetworkPortalNotification[] =
 // and it requires |kEnableDemoMode| flag to be enabled to take effect.
 const char kEnableOfflineDemoMode[] = "enable-offline-demo-mode";
 
+// Enables Recommend Apps screen in OOBE.
+const char kEnableOobeRecommendAppsScreen[] =
+    "enable-oobe-recommend-apps-screen";
+
 // Enables suggestions while typing on a physical keyboard.
 const char kEnablePhysicalKeyboardAutocorrect[] =
     "enable-physical-keyboard-autocorrect";

chromeos/chromeos_switches.h

@@ -102,6 +102,7 @@ CHROMEOS_EXPORT extern const char kEnableFileManagerTouchMode[];
 CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[];
 CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[];
 CHROMEOS_EXPORT extern const char kEnableOfflineDemoMode[];
+CHROMEOS_EXPORT extern const char kEnableOobeRecommendAppsScreen[];
 CHROMEOS_EXPORT extern const char kEnablePhysicalKeyboardAutocorrect[];
 CHROMEOS_EXPORT extern const char kEnableRequestTabletSite[];
 CHROMEOS_EXPORT extern const char kEnableScreenshotTestingWithMode[];