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

chrome/browser/chromeos/login/base_login_display_host.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/base_login_display_host.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/input_method_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
+#include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/login/apply_services_customization.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/views_login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/system_access.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 70 matching lines @@
 }
 
 // LoginDisplayHost implementation ---------------------------------------------
 
 void BaseLoginDisplayHost::OnSessionStart() {
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void BaseLoginDisplayHost::StartWizard(
     const std::string& first_screen_name,
-    const chromeos::StartupCustomizationDocument* manifest,
     const GURL& start_url) {
   DVLOG(1) << "Starting wizard, first_screen_name: " << first_screen_name;
   // Create and show the wizard.
   wizard_controller_.reset();  // Only one controller in a time.
   wizard_controller_.reset(new WizardController(this, background_bounds_));
-  wizard_controller_->SetCustomization(manifest);
   wizard_controller_->set_start_url(start_url);
   ShowBackground();
   if (!WizardController::IsDeviceRegistered())
     SetOobeProgressBarVisible(true);
   wizard_controller_->Init(first_screen_name);
 }
 
 void BaseLoginDisplayHost::StartSignInScreen() {
   DVLOG(1) << "Starting sign in screen";
   std::vector<chromeos::UserManager::User> users =
       chromeos::UserManager::Get()->GetUsers();
 
   // Fix for users who updated device and thus never passed register screen.
   // If we already have users, we assume that it is not a second part of
   // OOBE. See http://crosbug.com/6289
   if (!WizardController::IsDeviceRegistered() && !users.empty()) {
     VLOG(1) << "Mark device registered because there are remembered users: "
             << users.size();
     WizardController::MarkDeviceRegistered();
   }
 
   sign_in_controller_.reset();  // Only one controller in a time.
   sign_in_controller_.reset(new chromeos::ExistingUserController(this));
   ShowBackground();
   SetShutdownButtonEnabled(true);
   sign_in_controller_->Init(users);
 
-  // Initiate services customization.
-  chromeos::ApplyServicesCustomization::StartIfNeeded();
+  // Initiate service customization manifest fetching.
+  if (!ServicesCustomizationDocument::WasApplied())
+    ServicesCustomizationDocument::GetInstance()->StartFetching();
 }
 
 // BaseLoginDisplayHost --------------------------------------------------------
 
 void BaseLoginDisplayHost::Observe(NotificationType type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   CHECK(type == NotificationType::APP_TERMINATING);
 
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
@@ skipping 55 matching lines @@
   chromeos::LoginDisplayHost* display_host =
       new chromeos::ViewsLoginDisplayHost(screen_bounds);
 #endif
   if (show_login_screen && chromeos::CrosLibrary::Get()->EnsureLoaded()) {
     display_host->StartSignInScreen();
     return;
   }
 
   // Load startup manifest.
   const chromeos::StartupCustomizationDocument* startup_manifest =
-      chromeos::LoadStartupManifest();
+      chromeos::StartupCustomizationDocument::GetInstance();
 
   std::string locale;
-  if (startup_manifest) {
+  if (startup_manifest->IsReady()) {
     // Switch to initial locale if specified by customization
     // and has not been set yet. We cannot call
     // chromeos::LanguageSwitchMenu::SwitchLanguage here before
     // EmitLoginPromptReady.
     PrefService* prefs = g_browser_process->local_state();
     const std::string current_locale =
         prefs->GetString(prefs::kApplicationLocale);
     VLOG(1) << "Current locale: " << current_locale;
     if (current_locale.empty()) {
       locale = startup_manifest->initial_locale();
@@ skipping 22 matching lines @@
             ResourceBundle::ReloadSharedInstance(locale);
         CHECK(!loaded_locale.empty()) << "Locale could not be found for "
                                       << locale;
         // Set the application locale here so that the language switch
         // menu works properly with the newly loaded locale.
         g_browser_process->SetApplicationLocale(loaded_locale);
       }
     }
   }
 
-  display_host->StartWizard(first_screen_name, startup_manifest, GURL());
+  display_host->StartWizard(first_screen_name, GURL());
 
   chromeos::LoginUtils::Get()->PrewarmAuthentication();
   if (chromeos::CrosLibrary::Get()->EnsureLoaded())
     chromeos::CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptReady();
 
-  if (startup_manifest) {
+  if (startup_manifest->IsReady()) {
     // Set initial timezone if specified by customization.
     const std::string timezone_name = startup_manifest->initial_timezone();
     VLOG(1) << "Initial time zone: " << timezone_name;
     // Apply locale customizations only once so preserve whatever locale
     // user has changed to during OOBE.
     if (!timezone_name.empty()) {
       icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
           icu::UnicodeString::fromUTF8(timezone_name));
       CHECK(timezone) << "Timezone could not be set for " << timezone_name;
       chromeos::SystemAccess::GetInstance()->SetTimezone(*timezone);
     }
   }
 }
 
 }  // namespace browser