ChromeOS: Fix "continue OOBE on restart" functionality.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 45 matching lines @@
 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"
 #include "chrome/browser/ui/webui/test_files_request_filter.h"
 #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"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/web_ui_util.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 94 matching lines @@
   std::string path = url.path().size() ? url.path().substr(1) : "";
   if (std::find(kKnownDisplayTypes,
                 kKnownDisplayTypes + arraysize(kKnownDisplayTypes),
                 path) == kKnownDisplayTypes + arraysize(kKnownDisplayTypes)) {
     LOG(ERROR) << "Unknown display type '" << path << "'. Setting default.";
     return OobeUI::kLoginDisplay;
   }
   return path;
 }
 
-bool UseMDOobe() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kEnableMdOobe);
-}
-
 }  // namespace
 
 // static
 const char OobeUI::kOobeDisplay[] = "oobe";
 const char OobeUI::kLoginDisplay[] = "login";
 const char OobeUI::kLockDisplay[] = "lock";
 const char OobeUI::kUserAddingDisplay[] = "user-adding";
 const char OobeUI::kAppLaunchSplashDisplay[] = "app-launch-splash";
 
 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
@@ skipping 287 matching lines @@
   }
 
   bool keyboard_driven_oobe =
       system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
   localized_strings->SetString("highlightStrength",
                                keyboard_driven_oobe ? "strong" : "normal");
 
   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) {
   web_ui()->AddMessageHandler(handler);
   handlers_.push_back(handler);
 }
 
 void OobeUI::InitializeHandlers() {
   ready_ = true;
   for (size_t i = 0; i < ready_callbacks_.size(); ++i)
@@ skipping 85 matching lines @@
   } else {
     NOTIMPLEMENTED();
   }
 
   current_screen_ = new_screen;
   FOR_EACH_OBSERVER(Observer,
                     observer_list_,
                     OnCurrentScreenChanged(current_screen_, new_screen));
 }
 
-void OobeUI::EnableMdOobe() {
-  md_oobe_enabled_ = true;
-}
-
 }  // namespace chromeos