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

chrome/browser/chromeos/login/existing_user_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/existing_user_controller.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/views_login_display.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 194 matching lines @@
   if (command_line->HasSwitch(switches::kEnableDevicePolicy)) {
     ownership_checker_.reset(new OwnershipStatusChecker(NewCallback(
         this, &ExistingUserController::OnEnrollmentOwnershipCheckCompleted)));
   }
 }
 
 void ExistingUserController::OnEnrollmentOwnershipCheckCompleted(
     OwnershipService::Status status) {
   if (status == OwnershipService::OWNERSHIP_NONE) {
     host_->StartWizard(WizardController::kEnterpriseEnrollmentScreenName,
-                       NULL, GURL());
+                       GURL());
     login_display_->OnFadeOut();
   }
   ownership_checker_.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExistingUserController, LoginPerformer::Delegate implementation:
 //
 
 void ExistingUserController::OnLoginFailure(const LoginFailure& failure) {
@@ skipping 87 matching lines @@
 
 }
 
 void ExistingUserController::OnProfilePrepared(Profile* profile) {
   // TODO(nkostylev): May add login UI implementation callback call.
   if (!ready_for_browser_launch_) {
 #if defined(OFFICIAL_BUILD)
     CommandLine::ForCurrentProcess()->AppendArg(kGetStartedURL);
 #endif  // OFFICIAL_BUILD
 
-    if (!initial_start_page_.empty()) {
-      // If initial_start_page is not empty, add it as second tab.
-      // The tabs are opened in the same order as arguments in command line.
-      CommandLine::ForCurrentProcess()->AppendArg(initial_start_page_);
+    ServicesCustomizationDocument* customization =
+      ServicesCustomizationDocument::GetInstance();
+    if (customization->IsReady()) {
+      std::string locale = g_browser_process->GetApplicationLocale();
+      std::string initial_start_page =
+          customization->GetInitialStartPage(locale);
+      if (!initial_start_page.empty())
+        CommandLine::ForCurrentProcess()->AppendArg(initial_start_page);
+      customization->ApplyCustomization();
     }
 
     if (two_factor_credentials_) {
       // If we have a two factor error and and this is a new user,
       // load the personal settings page.
       // TODO(stevenjb): direct the user to a lightweight sync login page.
       CommandLine::ForCurrentProcess()->AppendArg(kSettingsSyncLoginURL);
     }
 
     ActivateWizard(WizardController::IsDeviceRegistered() ?
@@ skipping 73 matching lines @@
     login_performer_->ResyncEncryptedData();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExistingUserController, private:
 
 void ExistingUserController::ActivateWizard(const std::string& screen_name) {
   GURL start_url;
   if (chromeos::UserManager::Get()->IsLoggedInAsGuest())
     start_url = guest_mode_url_;
-  host_->StartWizard(screen_name, NULL, start_url);
+  host_->StartWizard(screen_name, start_url);
   login_display_->OnFadeOut();
 }
 
 gfx::NativeWindow ExistingUserController::GetNativeWindow() const {
   return host_->GetNativeWindow();
 }
 
 void ExistingUserController::SetStatusAreaEnabled(bool enable) {
   host_->SetStatusAreaEnabled(enable);
 }
@@ skipping 20 matching lines @@
       help_topic_id = login_performer_->login_timed_out() ?
           HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT_OFFLINE :
           HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT;
       break;
   }
 
   login_display_->ShowError(error_id, num_login_attempts_, help_topic_id);
 }
 
 }  // namespace chromeos