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

Side by Side 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, 9 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 void LoginScreenContext::Init() { 284 void LoginScreenContext::Init() {
285 oobe_ui_ = false; 285 oobe_ui_ = false;
286 } 286 }
287 287
288 // SigninScreenHandler implementation ------------------------------------------ 288 // SigninScreenHandler implementation ------------------------------------------
289 289
290 SigninScreenHandler::SigninScreenHandler( 290 SigninScreenHandler::SigninScreenHandler(
291 const scoped_refptr<NetworkStateInformer>& network_state_informer, 291 const scoped_refptr<NetworkStateInformer>& network_state_informer,
292 ErrorScreen* error_screen, 292 ErrorScreen* error_screen,
293 CoreOobeView* core_oobe_view, 293 CoreOobeView* core_oobe_view,
294 GaiaScreenHandler* gaia_screen_handler) 294 GaiaScreenHandler* gaia_screen_handler,
295 : network_state_informer_(network_state_informer), 295 JSCallsContainer* js_calls_container)
296 : BaseScreenHandler(js_calls_container),
297 network_state_informer_(network_state_informer),
296 error_screen_(error_screen), 298 error_screen_(error_screen),
297 core_oobe_view_(core_oobe_view), 299 core_oobe_view_(core_oobe_view),
298 caps_lock_enabled_(chromeos::input_method::InputMethodManager::Get() 300 caps_lock_enabled_(chromeos::input_method::InputMethodManager::Get()
299 ->GetImeKeyboard() 301 ->GetImeKeyboard()
300 ->CapsLockIsEnabled()), 302 ->CapsLockIsEnabled()),
301 proxy_auth_dialog_reload_times_(kMaxGaiaReloadForProxyAuthDialog), 303 proxy_auth_dialog_reload_times_(kMaxGaiaReloadForProxyAuthDialog),
302 gaia_screen_handler_(gaia_screen_handler), 304 gaia_screen_handler_(gaia_screen_handler),
303 touch_view_binding_(this), 305 touch_view_binding_(this),
304 histogram_helper_(new ErrorScreensHistogramHelper("Signin")), 306 histogram_helper_(new ErrorScreensHistogramHelper("Signin")),
305 weak_factory_(this) { 307 weak_factory_(this) {
306 DCHECK(network_state_informer_.get()); 308 DCHECK(network_state_informer_.get());
307 DCHECK(error_screen_); 309 DCHECK(error_screen_);
308 DCHECK(core_oobe_view_); 310 DCHECK(core_oobe_view_);
311 DCHECK(js_calls_container);
309 gaia_screen_handler_->set_signin_screen_handler(this); 312 gaia_screen_handler_->set_signin_screen_handler(this);
310 network_state_informer_->AddObserver(this); 313 network_state_informer_->AddObserver(this);
311 314
312 registrar_.Add(this, 315 registrar_.Add(this,
313 chrome::NOTIFICATION_AUTH_NEEDED, 316 chrome::NOTIFICATION_AUTH_NEEDED,
314 content::NotificationService::AllSources()); 317 content::NotificationService::AllSources());
315 registrar_.Add(this, 318 registrar_.Add(this,
316 chrome::NOTIFICATION_AUTH_SUPPLIED, 319 chrome::NOTIFICATION_AUTH_SUPPLIED,
317 content::NotificationService::AllSources()); 320 content::NotificationService::AllSources());
318 registrar_.Add(this, 321 registrar_.Add(this,
(...skipping 810 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 1132
1130 void SigninScreenHandler::SuspendDone(const base::TimeDelta& sleep_duration) { 1133 void SigninScreenHandler::SuspendDone(const base::TimeDelta& sleep_duration) {
1131 for (user_manager::User* user : 1134 for (user_manager::User* user :
1132 user_manager::UserManager::Get()->GetUnlockUsers()) { 1135 user_manager::UserManager::Get()->GetUnlockUsers()) {
1133 HidePinKeyboardIfNeeded(user->GetAccountId()); 1136 HidePinKeyboardIfNeeded(user->GetAccountId());
1134 } 1137 }
1135 } 1138 }
1136 1139
1137 void SigninScreenHandler::OnTouchViewToggled(bool enabled) { 1140 void SigninScreenHandler::OnTouchViewToggled(bool enabled) {
1138 touch_view_enabled_ = enabled; 1141 touch_view_enabled_ = enabled;
1139 CallJS("login.AccountPickerScreen.setTouchViewState", enabled); 1142 CallJSOrDefer("login.AccountPickerScreen.setTouchViewState", enabled);
1140 } 1143 }
1141 1144
1142 bool SigninScreenHandler::ShouldLoadGaia() const { 1145 bool SigninScreenHandler::ShouldLoadGaia() const {
1143 // Fetching of the extension is not started before account picker page is 1146 // Fetching of the extension is not started before account picker page is
1144 // loaded because it can affect the loading speed. 1147 // loaded because it can affect the loading speed.
1145 // Do not load the extension for the screen locker, see crosbug.com/25018. 1148 // Do not load the extension for the screen locker, see crosbug.com/25018.
1146 return !ScreenLocker::default_screen_locker() && 1149 return !ScreenLocker::default_screen_locker() &&
1147 is_account_picker_showing_first_time_; 1150 is_account_picker_showing_first_time_;
1148 } 1151 }
1149 1152
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
1645 rate.initial_delay_in_ms = auto_repeat_delay; 1648 rate.initial_delay_in_ms = auto_repeat_delay;
1646 rate.repeat_interval_in_ms = auto_repeat_interval; 1649 rate.repeat_interval_in_ms = auto_repeat_interval;
1647 input_method::InputMethodManager::Get() 1650 input_method::InputMethodManager::Get()
1648 ->GetImeKeyboard() 1651 ->GetImeKeyboard()
1649 ->SetAutoRepeatEnabled(true); 1652 ->SetAutoRepeatEnabled(true);
1650 input_method::InputMethodManager::Get()->GetImeKeyboard()->SetAutoRepeatRate( 1653 input_method::InputMethodManager::Get()->GetImeKeyboard()->SetAutoRepeatRate(
1651 rate); 1654 rate);
1652 } 1655 }
1653 1656
1654 } // namespace chromeos 1657 } // namespace chromeos
OLDNEW
« 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