Made small refactoring of OobeUI.

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 <string>
-
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/values.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
@@ skipping 28 matching lines @@
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/webui/web_ui_util.h"
 
 namespace chromeos {
 
 namespace {
 
-// Path for a stripped down login page that does not have OOBE elements.
-const char kLoginPath[] = "login#login";
+const char kOobeDisplay[] = "oobe";

[Nikita (slow), 2013/07/31 13:27:51]

nit: I think short comment may be added here that describes how these are used.

[dzhioev (left Google), 2013/08/01 13:38:09]

Done.

+const char kLoginDisplay[] = "login";
+const char kLockDisplay[] = "lock";
+const char kUserAddingDisplay[] = "user-adding";
+
+const char* kKnownDisplayTypes[] = {
+  kOobeDisplay,
+  kLoginDisplay,
+  kLockDisplay,
+  kUserAddingDisplay
+};
 
 const char kStringsJSPath[] = "strings.js";
 const char kLoginJSPath[] = "login.js";
 const char kOobeJSPath[] = "oobe.js";
 const char kKeyboardUtilsJSPath[] = "keyboard_utils.js";
 const char kDemoUserLoginJSPath[] = "demo_user_login.js";
 
 // Paths for deferred resource loading.
 const char kEnrollmentHTMLPath[] = "enrollment.html";
 const char kEnrollmentCSSPath[] = "enrollment.css";
@@ skipping 10 matching lines @@
         new base::RefCountedBytes();
     callback.Run(empty_bytes.get());
     return true;
   }
 
   return false;
 }
 
 // Creates a WebUIDataSource for chrome://oobe
 content::WebUIDataSource* CreateOobeUIDataSource(
-    const base::DictionaryValue& localized_strings) {
+    const base::DictionaryValue& localized_strings,
+    const std::string& display_type) {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIOobeHost);
   source->SetUseJsonJSFormatV2();
   source->AddLocalizedStrings(localized_strings);
   source->SetJsonPath(kStringsJSPath);
 
   if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
     source->SetDefaultResource(IDR_DEMO_USER_LOGIN_HTML);
-    source->AddResourcePath(kDemoUserLoginJSPath,
-                            IDR_DEMO_USER_LOGIN_JS);
+    source->AddResourcePath(kDemoUserLoginJSPath, IDR_DEMO_USER_LOGIN_JS);
     return source;
   }
-
-  source->SetDefaultResource(IDR_OOBE_HTML);
-  source->AddResourcePath(kOobeJSPath,
-                          IDR_OOBE_JS);
-  source->AddResourcePath(kLoginPath,
-                          IDR_LOGIN_HTML);
-  source->AddResourcePath(kLoginJSPath,
-                          IDR_LOGIN_JS);
-  source->AddResourcePath(kKeyboardUtilsJSPath,
-                          IDR_KEYBOARD_UTILS_JS);
+  if (display_type == kOobeDisplay) {
+    source->SetDefaultResource(IDR_OOBE_HTML);
+    source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS);
+  } else {
+    source->SetDefaultResource(IDR_LOGIN_HTML);
+    source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS);
+  }
+  source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS);
   source->OverrideContentSecurityPolicyFrameSrc(
       "frame-src chrome://terms/ "
       "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/;");
 
   // Serve deferred resources.
-  source->AddResourcePath(kEnrollmentHTMLPath,
-                          IDR_OOBE_ENROLLMENT_HTML);
-  source->AddResourcePath(kEnrollmentCSSPath,
-                          IDR_OOBE_ENROLLMENT_CSS);
-  source->AddResourcePath(kEnrollmentJSPath,
-                          IDR_OOBE_ENROLLMENT_JS);
+  source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML);
+  source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS);
+  source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS);
 
   return source;
 }
 
+std::string GetDisplayType(const GURL& url) {
+  std::string path = url.path().size() ? url.path().substr(1) : "";
+  if (std::find(kKnownDisplayTypes,
+                kKnownDisplayTypes + arraysize(kKnownDisplayTypes),
+                path) == kKnownDisplayTypes + arraysize(kKnownDisplayTypes)) {
+    LOG(ERROR) << "Unknown display type '" << path << "'. Setting default.";
+    return kLoginDisplay;
+  }
+  return path;
+}
+
 }  // namespace
 
 // static
 const char OobeUI::kScreenOobeNetwork[]     = "connect";
 const char OobeUI::kScreenOobeEula[]        = "eula";
 const char OobeUI::kScreenOobeUpdate[]      = "update";
 const char OobeUI::kScreenOobeEnrollment[]  = "oauth-enrollment";
 const char OobeUI::kScreenGaiaSignin[]      = "gaia-signin";
 const char OobeUI::kScreenAccountPicker[]   = "account-picker";
 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch";
 const char OobeUI::kScreenKioskEnable[]     = "kiosk-enable";
 const char OobeUI::kScreenErrorMessage[]    = "error-message";
 const char OobeUI::kScreenUserImagePicker[] = "user-image";
 const char OobeUI::kScreenTpmError[]        = "tpm-error-message";
 const char OobeUI::kScreenPasswordChanged[] = "password-changed";
 const char OobeUI::kScreenManagedUserCreationFlow[]
                                             = "managed-user-creation";
 const char OobeUI::kScreenTermsOfService[]  = "terms-of-service";
 const char OobeUI::kScreenWrongHWID[]       = "wrong-hwid";
 
-OobeUI::OobeUI(content::WebUI* web_ui)
+OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
     : WebUIController(web_ui),
+      core_handler_(NULL),
       update_screen_handler_(NULL),
       network_screen_actor_(NULL),
       eula_screen_actor_(NULL),
       reset_screen_actor_(NULL),
       autolaunch_screen_actor_(NULL),
       kiosk_enable_screen_actor_(NULL),
       wrong_hwid_screen_actor_(NULL),
       locally_managed_user_creation_screen_actor_(NULL),
       error_screen_handler_(NULL),
       signin_screen_handler_(NULL),
       terms_of_service_screen_actor_(NULL),
       user_image_screen_actor_(NULL),
       kiosk_app_menu_handler_(NULL),
       current_screen_(SCREEN_UNKNOWN),
       ready_(false) {
+  display_type_ = GetDisplayType(url);
   InitializeScreenMaps();
 
   network_state_informer_ = new NetworkStateInformer();
   network_state_informer_->Init();
 
   core_handler_ = new CoreOobeHandler(this);
   AddScreenHandler(core_handler_);
   core_handler_->SetDelegate(this);
 
   AddScreenHandler(new NetworkDropdownHandler);
 
   update_screen_handler_ = new UpdateScreenHandler();
   AddScreenHandler(update_screen_handler_);
 
-  NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler();
-  network_screen_actor_ = network_screen_handler;
-  AddScreenHandler(network_screen_handler);
+  if (display_type_ == kOobeDisplay) {
+    NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler();
+    network_screen_actor_ = network_screen_handler;
+    AddScreenHandler(network_screen_handler);
+  }
 
   EulaScreenHandler* eula_screen_handler = new EulaScreenHandler();
   eula_screen_actor_ = eula_screen_handler;
   AddScreenHandler(eula_screen_handler);
 
   ResetScreenHandler* reset_screen_handler = new ResetScreenHandler();
   reset_screen_actor_ = reset_screen_handler;
   AddScreenHandler(reset_screen_handler);
 
   KioskAutolaunchScreenHandler* autolaunch_screen_handler =
@@ skipping 52 matching lines @@
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 
   // Set up the chrome://terms/ data source, for EULA content.
   AboutUIHTMLSource* about_source =
       new AboutUIHTMLSource(chrome::kChromeUITermsHost, profile);
   content::URLDataSource::Add(profile, about_source);
 
   // Set up the chrome://oobe/ source.
   content::WebUIDataSource::Add(profile,
-                                CreateOobeUIDataSource(localized_strings));
+                                CreateOobeUIDataSource(localized_strings,
+                                                       display_type_));
 
   // Set up the chrome://userimage/ source.
   options::UserImageSource* user_image_source =
       new options::UserImageSource();
   content::URLDataSource::Add(profile, user_image_source);
 }
 
 OobeUI::~OobeUI() {
   core_handler_->SetDelegate(NULL);
 }
@@ skipping 162 matching lines @@
 void OobeUI::OnCurrentScreenChanged(const std::string& screen) {
   if (screen_ids_.count(screen)) {
     current_screen_ = screen_ids_[screen];
   } else {
     NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
     current_screen_ = SCREEN_UNKNOWN;
   }
 }
 
 }  // namespace chromeos