ChromeOS: Fix "continue OOBE on restart" functionality.

This CL allows polymer-based OOBE to continue on chrome restart.

BUG=604119
TEST=none

Review-Url: https://codereview.chromium.org/2289643003
Cr-Commit-Position: refs/heads/master@{#415523}

chrome/browser/chromeos/login/startup_utils.cc

@@ -84,6 +84,7 @@ namespace chromeos {
 void StartupUtils::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kOobeComplete, false);
   registry->RegisterStringPref(prefs::kOobeScreenPending, "");
+  registry->RegisterBooleanPref(prefs::kOobeMdMode, false);
   registry->RegisterIntegerPref(prefs::kDeviceRegistered, -1);
   registry->RegisterBooleanPref(prefs::kEnrollmentRecoveryRequired, false);
   registry->RegisterStringPref(prefs::kInitialLocale, "en-US");

chrome/browser/chromeos/login/wizard_controller.cc

@@ -184,6 +184,11 @@ void InitializeCrashReporter() {
 }
 #endif
 
+bool UseMDOobe() {
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kEnableMdOobe);
+}
+
 }  // namespace
 
 namespace chromeos {
@@ -314,6 +319,10 @@ void WizardController::Init(const std::string& first_screen_name) {
   // an eligible controller is detected later.
   SetControllerDetectedPref(false);
 
+  // If flag disappeared after restart, disable.
+  if (!UseMDOobe())
+    GetLocalState()->SetBoolean(prefs::kOobeMdMode, false);
+
   AdvanceToScreen(first_screen_name_);
   if (!IsMachineHWIDCorrect() && !StartupUtils::IsDeviceRegistered() &&
       first_screen_name_.empty())
@@ -920,7 +929,9 @@ void WizardController::OnHIDScreenNecessityCheck(bool screen_needed) {
   if (screen_needed) {
     ShowHIDDetectionScreen();
   } else {
-    oobe_ui_->EnableMdOobe();
+    if (UseMDOobe())
+      GetLocalState()->SetBoolean(prefs::kOobeMdMode, true);
+
     ShowNetworkScreen();
   }
 }
@@ -976,7 +987,9 @@ void WizardController::AdvanceToScreen(const std::string& screen_name) {
             weak_factory_.GetWeakPtr());
         oobe_ui_->GetHIDDetectionView()->CheckIsScreenRequired(on_check);
       } else {
-        oobe_ui_->EnableMdOobe();
+        if (UseMDOobe())
+          GetLocalState()->SetBoolean(prefs::kOobeMdMode, true);
+
         ShowNetworkScreen();
       }
     } else {

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

@@ -63,11 +63,13 @@
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/chrome_unscaled_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
+#include "components/prefs/pref_service.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/content_switches.h"
@@ -182,11 +184,6 @@ std::string GetDisplayType(const GURL& url) {
   return path;
 }
 
-bool UseMDOobe() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kEnableMdOobe);
-}
-
 }  // namespace
 
 // static
@@ -494,7 +491,9 @@ void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
   bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
   localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off");
   localized_strings->SetString(
-      "newOobeUI", (md_oobe_enabled_ && UseMDOobe()) ? "on" : "off");
+      "newOobeUI",
+      g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode) ? "on"
+                                                                       : "off");
 }
 
 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
@@ -600,8 +599,4 @@ void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
                     OnCurrentScreenChanged(current_screen_, new_screen));
 }
 
-void OobeUI::EnableMdOobe() {
-  md_oobe_enabled_ = true;
-}
-
 }  // namespace chromeos

chrome/browser/ui/webui/chromeos/login/oobe_ui.h

@@ -154,9 +154,6 @@ class OobeUI : public content::WebUIController,
     return network_state_informer_.get();
   }
 
-  // This call enables polymer-based UI.
-  void EnableMdOobe();
-
  private:
   void AddScreenHandler(BaseScreenHandler* handler);
 
@@ -241,9 +238,6 @@ class OobeUI : public content::WebUIController,
   // Observer of CrosSettings watching the kRebootOnShutdown policy.
   std::unique_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
 
-  // This controls displaying of polymer-based OOBE UI.
-  bool md_oobe_enabled_ = false;
-
   DISALLOW_COPY_AND_ASSIGN(OobeUI);
 };
 

chrome/common/pref_names.cc

@@ -1817,6 +1817,9 @@ const char kOobeComplete[] = "OobeComplete";
 // The name of the screen that has to be shown if OOBE has been interrupted.
 const char kOobeScreenPending[] = "OobeScreenPending";
 
+// If material design OOBE should be selected if OOBE has been interrupted.
+const char kOobeMdMode[] = "OobeMdModeEnabled";
+
 // A boolean pref to indicate if an eligible controller (either a Chrome OS
 // device, or an Android device) is detected during bootstrapping or
 // shark/remora setup process. A controller can help the device go through OOBE

chrome/common/pref_names.h

@@ -641,6 +641,7 @@ extern const char kCachedMultiProfileUserBehavior[];
 extern const char kInitialLocale[];
 extern const char kOobeComplete[];
 extern const char kOobeScreenPending[];
+extern const char kOobeMdMode[];
 extern const char kOobeControllerDetected[];
 extern const char kCanShowOobeGoodiesPage[];
 extern const char kDeviceRegistered[];