Make customization documents singletons.

chrome/browser/ui/webui/chromeos/register_page_ui.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/ui/webui/chromeos/register_page_ui.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 201 matching lines @@
 #if defined(OS_CHROMEOS)
   web_ui_->RegisterMessageCallback(kJsCallbackGetRegistrationUrl,
       NewCallback(this, &RegisterPageHandler::HandleGetRegistrationUrl));
   web_ui_->RegisterMessageCallback(kJsCallbackUserInfo,
       NewCallback(this, &RegisterPageHandler::HandleGetUserInfo));
 #endif
 }
 
 void RegisterPageHandler::HandleGetRegistrationUrl(const ListValue* args) {
 #if defined(OS_CHROMEOS)
+  chromeos::StartupCustomizationDocument* customization =
+    chromeos::StartupCustomizationDocument::GetInstance();
   if (WizardController::default_controller() &&
-      WizardController::default_controller()->GetCustomization()) {
-    const std::string& url = WizardController::default_controller()->
-        GetCustomization()->registration_url();
+      customization->IsReady()) {
+    const std::string& url = customization->registration_url();
     VLOG(1) << "Loading registration form with URL: " << url;
     GURL register_url(url);
     if (!register_url.is_valid()) {
       SkipRegistration("Registration URL defined in manifest is invalid.");
       return;
     }
     StringValue url_value(url);
     web_ui_->CallJavascriptFunction(kJsApiSetRegistrationUrl, url_value);
   } else {
     SkipRegistration("Startup manifest not defined.");
@@ skipping 72 matching lines @@
 
 RegisterPageUI::RegisterPageUI(TabContents* contents) : WebUI(contents){
   RegisterPageHandler* handler = new RegisterPageHandler();
   AddMessageHandler((handler)->Attach(this));
   handler->Init();
   RegisterPageUIHTMLSource* html_source = new RegisterPageUIHTMLSource();
 
   // Set up the chrome://register/ source.
   contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }