Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2914)

Unified Diff: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h

Issue 2697063004: Fix of "login is not defined" error in OOBE (Closed)
Patch Set: Merge Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
index 9ec989159dc6d215aa22a38094287aba1a036aba..33a11e9ed8992ad794e3029fcb119fa853fdfeae 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
@@ -45,7 +45,8 @@ class CoreOobeHandler : public BaseScreenHandler,
virtual void OnCurrentScreenChanged(OobeScreen screen) = 0;
};
- explicit CoreOobeHandler(OobeUI* oobe_ui);
+ explicit CoreOobeHandler(OobeUI* oobe_ui,
+ JSCallsContainer* js_calls_container);
~CoreOobeHandler() override;
void SetDelegate(Delegate* delegate);
@@ -80,23 +81,6 @@ class CoreOobeHandler : public BaseScreenHandler,
void UpdateShutdownAndRebootVisibility(bool reboot_on_shutdown);
private:
- // Calls javascript method.
- //
- // Note that the Args template parameter pack should consist of types
- // convertible to base::Value.
- template <typename... Args>
- void ExecuteDeferredJSCall(const std::string& function_name,
- std::unique_ptr<Args>... args);
-
- // Calls javascript method if the instance is already initialized, or defers
- // the call until it gets initialized.
- template <typename... Args>
- void CallJSOrDefer(const std::string& function_name, const Args&... args);
-
- // Executes javascript calls that were deferred while the instance was not
- // initialized yet.
- void ExecuteDeferredJSCalls();
-
// CoreOobeActor implementation:
void ShowSignInError(int login_attempts,
const std::string& error_text,
@@ -168,16 +152,6 @@ class CoreOobeHandler : public BaseScreenHandler,
void OnAccessibilityStatusChanged(
const AccessibilityStatusEventDetails& details);
- // Whether the instance is initialized.
- //
- // The instance becomes initialized after the corresponding message is
- // received from javascript side.
- bool is_initialized_ = false;
-
- // Javascript calls that have been deferred while the instance was not
- // initialized yet.
- std::vector<base::Closure> deferred_js_calls_;
-
// Owner of this handler.
OobeUI* oobe_ui_ = nullptr;

Powered by Google App Engine
This is Rietveld 408576698