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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 8471f1f22d05bb3ffec16372fc8ceac4753d39c8..3e90662d7f912257d55c99ca2287801e4ad08522 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -291,8 +291,10 @@ SigninScreenHandler::SigninScreenHandler(
const scoped_refptr<NetworkStateInformer>& network_state_informer,
ErrorScreen* error_screen,
CoreOobeView* core_oobe_view,
- GaiaScreenHandler* gaia_screen_handler)
- : network_state_informer_(network_state_informer),
+ GaiaScreenHandler* gaia_screen_handler,
+ JSCallsContainer* js_calls_container)
+ : BaseScreenHandler(js_calls_container),
+ network_state_informer_(network_state_informer),
error_screen_(error_screen),
core_oobe_view_(core_oobe_view),
caps_lock_enabled_(chromeos::input_method::InputMethodManager::Get()
@@ -306,6 +308,7 @@ SigninScreenHandler::SigninScreenHandler(
DCHECK(network_state_informer_.get());
DCHECK(error_screen_);
DCHECK(core_oobe_view_);
+ DCHECK(js_calls_container);
gaia_screen_handler_->set_signin_screen_handler(this);
network_state_informer_->AddObserver(this);
@@ -1136,7 +1139,7 @@ void SigninScreenHandler::SuspendDone(const base::TimeDelta& sleep_duration) {
void SigninScreenHandler::OnTouchViewToggled(bool enabled) {
touch_view_enabled_ = enabled;
- CallJS("login.AccountPickerScreen.setTouchViewState", enabled);
+ CallJSOrDefer("login.AccountPickerScreen.setTouchViewState", enabled);
}
bool SigninScreenHandler::ShouldLoadGaia() const {
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698