Fix of "login is not defined" error in OOBE

chrome/browser/ui/webui/chromeos/login/core_oobe_handler.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/core_oobe_handler.h"
 
 #include <type_traits>
 
 #include "ash/common/accessibility_types.h"
 #include "ash/shell.h"
@@ skipping 37 matching lines @@
 namespace {
 
 const char kJsScreenPath[] = "cr.ui.Oobe";
 
 }  // namespace
 
 namespace chromeos {
 
 // Note that show_oobe_ui_ defaults to false because WizardController assumes
 // OOBE UI is not visible by default.
-CoreOobeHandler::CoreOobeHandler(OobeUI* oobe_ui)
-    : oobe_ui_(oobe_ui), version_info_updater_(this) {
+CoreOobeHandler::CoreOobeHandler(OobeUI* oobe_ui,
+                                 JSCallsContainer* js_calls_container)
+    : BaseScreenHandler(js_calls_container),
+      oobe_ui_(oobe_ui),
+      version_info_updater_(this) {
+  DCHECK(js_calls_container);
   set_call_js_prefix(kJsScreenPath);
   if (!ash_util::IsRunningInMash()) {
     AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
     CHECK(accessibility_manager);
     accessibility_subscription_ = accessibility_manager->RegisterCallback(
         base::Bind(&CoreOobeHandler::OnAccessibilityStatusChanged,
                    base::Unretained(this)));
   } else {
     NOTIMPLEMENTED();
   }
@@ skipping 87 matching lines @@
   AddCallback("toggleResetScreen", &CoreOobeHandler::HandleToggleResetScreen);
   AddCallback("toggleEnableDebuggingScreen",
               &CoreOobeHandler::HandleEnableDebuggingScreen);
   AddCallback("headerBarVisible",
               &CoreOobeHandler::HandleHeaderBarVisible);
   AddCallback("raiseTabKeyEvent", &CoreOobeHandler::HandleRaiseTabKeyEvent);
   AddCallback("setOobeBootstrappingSlave",
               &CoreOobeHandler::HandleSetOobeBootstrappingSlave);
 }
 
-template <typename... Args>
-void CoreOobeHandler::ExecuteDeferredJSCall(const std::string& function_name,
-                                            std::unique_ptr<Args>... args) {
-  CallJS(function_name, *args...);
-}
-
-template <typename... Args>
-void CoreOobeHandler::CallJSOrDefer(const std::string& function_name,
-                                    const Args&... args) {
-  if (is_initialized_) {
-    CallJS(function_name, args...);
-  } else {
-    // Note that std::conditional is used here in order to obtain a sequence of
-    // base::Value types with the length equal to sizeof...(Args); the C++
-    // template parameter pack expansion rules require that the name of the
-    // parameter pack appears in the pattern, even though the elements of the
-    // Args pack are not actually in this code.
-    deferred_js_calls_.push_back(base::Bind(
-        &CoreOobeHandler::ExecuteDeferredJSCall<
-            typename std::conditional<true, base::Value, Args>::type...>,
-        base::Unretained(this), function_name,
-        base::Passed(::login::MakeValue(args).CreateDeepCopy())...));
-  }
-}
-
-void CoreOobeHandler::ExecuteDeferredJSCalls() {
-  for (const auto& deferred_js_call : deferred_js_calls_)
-    deferred_js_call.Run();
-  deferred_js_calls_.clear();
-}
-
 void CoreOobeHandler::ShowSignInError(
     int login_attempts,
     const std::string& error_text,
     const std::string& help_link_text,
     HelpAppLauncher::HelpTopic help_topic_id) {
   LOG(ERROR) << "CoreOobeHandler::ShowSignInError: error_text=" << error_text;
   CallJSOrDefer("showSignInError", login_attempts, error_text,
          help_link_text, static_cast<int>(help_topic_id));
 }
 
@@ skipping 80 matching lines @@
 
 void CoreOobeHandler::ShowPinKeyboard(bool show) {
   CallJSOrDefer("showPinKeyboard", show);
 }
 
 void CoreOobeHandler::SetClientAreaSize(int width, int height) {
   CallJSOrDefer("setClientAreaSize", width, height);
 }
 
 void CoreOobeHandler::HandleInitialized() {
-  DCHECK(!is_initialized_);
-  is_initialized_ = true;
   ExecuteDeferredJSCalls();
   oobe_ui_->InitializeHandlers();
 }
 
 void CoreOobeHandler::HandleSkipUpdateEnrollAfterEula() {
   WizardController* controller = WizardController::default_controller();
   DCHECK(controller);
   if (controller)
     controller->SkipUpdateEnrollAfterEula();
 }
@@ skipping 216 matching lines @@
 
 void CoreOobeHandler::InitDemoModeDetection() {
   demo_mode_detector_.InitDetection();
 }
 
 void CoreOobeHandler::StopDemoModeDetection() {
   demo_mode_detector_.StopDetection();
 }
 
 }  // namespace chromeos