Re-landing mistakenly reverted CL http://codereview.chromium.org/2101021....

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"  // For NOTREACHED.
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
+#include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/login_screen.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 127 matching lines @@
 
 // Special test value that commands not to create any window yet.
 const char WizardController::kTestNoScreenName[] = "test:nowindow";
 
 // Initialize default controller.
 // static
 WizardController* WizardController::default_controller_ = NULL;
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, public:
+
 WizardController::WizardController()
     : widget_(NULL),
       background_widget_(NULL),
       background_view_(NULL),
       contents_(NULL),
       current_screen_(NULL),
       is_out_of_box_(false),
       observer_(NULL) {
   DCHECK(default_controller_ == NULL);
   default_controller_ = this;
@@ skipping 115 matching lines @@
 }
 
 void WizardController::SetStatusAreaVisible(bool visible) {
   // When ExistingUserController passes background ownership
   // to WizardController it happens after screen is shown.
   if (background_view_) {
     background_view_->SetStatusAreaVisible(visible);
   }
 }
 
+void WizardController::SetCustomization(
+    const chromeos::StartupCustomizationDocument* customization) {
+  customization_.reset(customization);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, ExitHandlers:
 void WizardController::OnLoginSignInSelected() {
   // We're on the stack, so don't try and delete us now.
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void WizardController::OnLoginCreateAccount() {
   ShowAccountScreen();
 }
@@ skipping 156 matching lines @@
           switches::kEnableLoginImages)) {
     std::vector<chromeos::UserManager::User> users =
         chromeos::UserManager::Get()->GetUsers();
     if (!users.empty()) {
       // ExistingUserController deletes itself.
       (new chromeos::ExistingUserController(users, screen_bounds))->Init();
       return;
     }
   }
 
+  // Load partner customization startup manifest if needed.
+  scoped_ptr<chromeos::StartupCustomizationDocument> customization;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kStartupManifest)) {
+    customization.reset(new chromeos::StartupCustomizationDocument());
+    FilePath manifest_path =
+        CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+            switches::kStartupManifest);
+    bool manifest_loaded = customization->LoadManifestFromFile(manifest_path);
+    DCHECK(manifest_loaded) << manifest_path.value();
+  }
+
+  // Create and show the wizard.
   WizardController* controller = new WizardController();
+  controller->SetCustomization(customization.release());
   controller->ShowBackground(screen_bounds);
   controller->Init(first_screen_name, screen_bounds, true);
   controller->Show();
   if (chromeos::CrosLibrary::Get()->EnsureLoaded())
     chromeos::CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptReady();
 }
 
 }  // namespace browser