New OOBE implementation skeleton using WUG toolkit.

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

 // Copyright (c) 2012 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/login/oobe_ui.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 56 matching lines @@
 
 namespace chromeos {
 
 namespace {
 
 const char* kKnownDisplayTypes[] = {
   OobeUI::kOobeDisplay,
   OobeUI::kLoginDisplay,
   OobeUI::kLockDisplay,
   OobeUI::kUserAddingDisplay,
-  OobeUI::kAppLaunchSplashDisplay,
-  OobeUI::kNewOobeDisplay
+  OobeUI::kAppLaunchSplashDisplay
 };
 
 const char kStringsJSPath[] = "strings.js";
 const char kLoginJSPath[] = "login.js";
 const char kOobeJSPath[] = "oobe.js";
 const char kKeyboardUtilsJSPath[] = "keyboard_utils.js";
 const char kCustomElementsHTMLPath[] = "custom_elements.html";
 const char kCustomElementsJSPath[] = "custom_elements.js";
 
 // Paths for deferred resource loading.
 const char kEnrollmentHTMLPath[] = "enrollment.html";
 const char kEnrollmentCSSPath[] = "enrollment.css";
 const char kEnrollmentJSPath[] = "enrollment.js";
 
-content::WebUIDataSource* CreateNewOobeUIDataSource(
-    const base::DictionaryValue& localized_strings) {
-  content::WebUIDataSource* source =
-      content::WebUIDataSource::Create(chrome::kChromeUIOobeHost);
-  source->AddLocalizedStrings(localized_strings);
-  source->SetJsonPath(kStringsJSPath);
-  source->SetDefaultResource(IDR_NEW_OOBE_HTML);
-  source->AddResourcePath(kOobeJSPath, IDR_NEW_OOBE_JS);
-  return source;
-}
-
 // Creates a WebUIDataSource for chrome://oobe
 content::WebUIDataSource* CreateOobeUIDataSource(
     const base::DictionaryValue& localized_strings,
     const std::string& display_type) {
-  if (display_type == OobeUI::kNewOobeDisplay) {
-    return CreateNewOobeUIDataSource(localized_strings);
-  }
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIOobeHost);
   source->AddLocalizedStrings(localized_strings);
   source->SetJsonPath(kStringsJSPath);
 
   if (display_type == OobeUI::kOobeDisplay) {
     source->SetDefaultResource(IDR_OOBE_HTML);
     source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS);
   } else {
     source->SetDefaultResource(IDR_LOGIN_HTML);
@@ skipping 40 matching lines @@
 }
 
 }  // namespace
 
 // static
 const char OobeUI::kOobeDisplay[] = "oobe";
 const char OobeUI::kLoginDisplay[] = "login";
 const char OobeUI::kLockDisplay[] = "lock";
 const char OobeUI::kUserAddingDisplay[] = "user-adding";
 const char OobeUI::kAppLaunchSplashDisplay[] = "app-launch-splash";
-const char OobeUI::kNewOobeDisplay[] = "new-oobe";
 
 // static
 const char OobeUI::kScreenOobeHIDDetection[] = "hid-detection";
 const char OobeUI::kScreenOobeNetwork[] = "connect";
 const char OobeUI::kScreenOobeEnableDebugging[] = "debugging";
 const char OobeUI::kScreenOobeEula[] = "eula";
 const char OobeUI::kScreenOobeUpdate[] = "update";
 const char OobeUI::kScreenOobeEnrollment[] = "oauth-enrollment";
 const char OobeUI::kScreenOobeReset[] = "reset";
 const char OobeUI::kScreenGaiaSignin[] = "gaia-signin";
@@ skipping 54 matching lines @@
   AddScreenHandler(core_handler_);
   core_handler_->SetDelegate(this);
 
   network_dropdown_handler_ = new NetworkDropdownHandler();
   AddScreenHandler(network_dropdown_handler_);
 
   update_screen_handler_ = new UpdateScreenHandler();
   AddScreenHandler(update_screen_handler_);
   network_dropdown_handler_->AddObserver(update_screen_handler_);
 
-  if (display_type_ == kOobeDisplay || display_type_ == kNewOobeDisplay) {
+  if (display_type_ == kOobeDisplay) {
     NetworkScreenHandler* network_screen_handler =
         new NetworkScreenHandler(core_handler_);
     network_view_ = network_screen_handler;
     AddScreenHandler(network_screen_handler);
   }
 
   EnableDebuggingScreenHandler* debugging_screen_handler =
       new EnableDebuggingScreenHandler();
   debugging_screen_actor_ = debugging_screen_handler;
   AddScreenHandler(debugging_screen_handler);
@@ skipping 398 matching lines @@
   DCHECK(screen_ids_.count(screen))
       << "Screen should be registered in InitializeScreenMaps()";
   Screen new_screen = screen_ids_[screen];
   FOR_EACH_OBSERVER(Observer,
                     observer_list_,
                     OnCurrentScreenChanged(current_screen_, new_screen));
   current_screen_ = new_screen;
 }
 
 }  // namespace chromeos