Merge 82987, 83304 - make sure that OEM tab is shown even if first login is Guest

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2011 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/chromeos/login/wizard_controller.h"
 
 #include <gdk/gdk.h>
 #include <signal.h>
 #include <sys/types.h>
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
-#include "chrome/browser/chromeos/login/apply_services_customization.h"
 #include "chrome/browser/chromeos/login/enterprise_enrollment_screen.h"
 #include "chrome/browser/chromeos/login/eula_view.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/html_page_screen.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/registration_screen.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
@@ skipping 136 matching lines @@
   views::Accelerator accel_eula_screen_;
   views::Accelerator accel_register_screen_;
   views::Accelerator accel_enterprise_enrollment_screen_;
 #endif
   views::Accelerator accel_toggle_accessibility_;
   views::Accelerator accel_cancel_update_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentView);
 };
 
-// Returns true if startup manifest defines valid registration URL.
-bool IsRegistrationScreenValid(
-    const chromeos::StartupCustomizationDocument* startup_manifest) {
-  return startup_manifest != NULL &&
-         GURL(startup_manifest->registration_url()).is_valid();
-}
-
 // Saves boolean "Local State" preference and forces its persistence to disk.
 void SaveBoolPreferenceForced(const char* pref_name, bool value) {
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetBoolean(pref_name, value);
   prefs->SavePersistentPrefs();
 }
 
 // Saves integer "Local State" preference and forces its persistence to disk.
 void SaveIntegerPreferenceForced(const char* pref_name, int value) {
   PrefService* prefs = g_browser_process->local_state();
@@ skipping 69 matching lines @@
 
   chromeos::WizardAccessibilityHelper::GetInstance()->
       UnregisterNotifications();
 }
 
 void WizardController::Init(const std::string& first_screen_name) {
   VLOG(1) << "Starting OOBE wizard with screen: " << first_screen_name;
   DCHECK(!contents_);
   first_screen_name_ = first_screen_name;
 
-  // When device is not registered yet we need to load startup manifest as well.
-  // In case of OOBE (network-EULA-update) manifest has been loaded in
-  // ShowLoginWizard().
-  if (IsOobeCompleted() && !IsDeviceRegistered())
-    SetCustomization(chromeos::LoadStartupManifest());
-
   contents_ = new ContentView();
 
   bool oobe_complete = IsOobeCompleted();
   if (!oobe_complete || first_screen_name == kOutOfBoxScreenName) {
     is_out_of_box_ = true;
   }
 
   ShowFirstScreen(first_screen_name);
 }
 
@@ skipping 115 matching lines @@
 void WizardController::ShowEulaScreen() {
   VLOG(1) << "Showing EULA screen.";
   SetStatusAreaVisible(false);
   SetCurrentScreen(GetEulaScreen());
 #if defined(OFFICIAL_BUILD)
   host_->SetOobeProgress(chromeos::BackgroundView::EULA);
 #endif
 }
 
 void WizardController::ShowRegistrationScreen() {
-  if (!IsRegistrationScreenValid(GetCustomization())) {
+  if (!IsRegisterScreenDefined()) {
     VLOG(1) << "Skipping registration screen: manifest not defined or invalid "
                "URL.";
     OnRegistrationSkipped();
     return;
   }
   VLOG(1) << "Showing registration screen.";
   SetStatusAreaVisible(true);
   SetCurrentScreen(GetRegistrationScreen());
 #if defined(OFFICIAL_BUILD)
   host_->SetOobeProgress(chromeos::BackgroundView::REGISTRATION);
 #endif
 }
 
 void WizardController::ShowHTMLPageScreen() {
   VLOG(1) << "Showing HTML page screen.";
   SetStatusAreaVisible(true);
   host_->SetOobeProgressBarVisible(false);
   SetCurrentScreen(GetHTMLPageScreen());
 }
 
 void WizardController::ShowEnterpriseEnrollmentScreen() {
   SetStatusAreaVisible(true);
   host_->SetOobeProgress(chromeos::BackgroundView::SIGNIN);
   SetCurrentScreen(GetEnterpriseEnrollmentScreen());
 }
 
-void WizardController::SetCustomization(
-    const chromeos::StartupCustomizationDocument* customization) {
-  customization_.reset(customization);
-}
-
-const chromeos::StartupCustomizationDocument*
-    WizardController::GetCustomization() const {
-  return customization_.get();
-}
-
 void WizardController::SkipRegistration() {
   if (current_screen_ == GetRegistrationScreen())
     OnRegistrationSkipped();
   else
     LOG(ERROR) << "Registration screen is not active.";
 }
 
 // static
 void WizardController::RegisterPrefs(PrefService* local_state) {
   local_state->RegisterBooleanPref(kOobeComplete, false);
@@ skipping 340 matching lines @@
 // static
 void WizardController::SetInitialLocale(const std::string& locale) {
   if (l10n_util::IsValidLocaleSyntax(locale))
     SaveStringPreferenceForced(kInitialLocale, locale);
   else
     NOTREACHED();
 }
 
 // static
 bool WizardController::IsRegisterScreenDefined() {
-  const chromeos::StartupCustomizationDocument* manifest = NULL;
-  // This method will be called from ExistingUserController too
-  // when Wizard instance doesn't exist.
-  if (default_controller())
-    manifest = default_controller()->GetCustomization();
-  else
-    manifest = chromeos::LoadStartupManifest();
-  return IsRegistrationScreenValid(manifest);
+  const chromeos::StartupCustomizationDocument* manifest =
+      chromeos::StartupCustomizationDocument::GetInstance();
+  return manifest->IsReady() &&
+         GURL(manifest->registration_url()).is_valid();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, chromeos::ScreenObserver overrides:
 void WizardController::OnExit(ExitCodes exit_code) {
   LOG(INFO) << "Wizard screen exit code: " << exit_code;
   switch (exit_code) {
     case NETWORK_CONNECTED:
       OnNetworkConnected();
       break;
@@ skipping 58 matching lines @@
   return contents_;
 }
 
 chromeos::ScreenObserver* WizardController::GetObserver(WizardScreen* screen) {
   return observer_ ? observer_ : this;
 }
 
 void WizardController::SetZeroDelays() {
   kShowDelayMs = 0;
 }