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

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

Issue 668213003: Reauthenticate the user before launching Smart Lock setup app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) { 1244 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
1245 if (core_oobe_actor_) { 1245 if (core_oobe_actor_) {
1246 core_oobe_actor_->ShowDeviceResetScreen(); 1246 core_oobe_actor_->ShowDeviceResetScreen();
1247 return; 1247 return;
1248 } 1248 }
1249 } 1249 }
1250 1250
1251 is_account_picker_showing_first_time_ = true; 1251 is_account_picker_showing_first_time_ = true;
1252 gaia_screen_handler_->MaybePreloadAuthExtension(); 1252 gaia_screen_handler_->MaybePreloadAuthExtension();
1253 1253
1254 ScreenlockBridge::Get()->SetLockHandler(this);
1254 if (ScreenLocker::default_screen_locker()) { 1255 if (ScreenLocker::default_screen_locker()) {
1255 ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady(); 1256 ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady();
1256 } 1257 }
1257 ScreenlockBridge::Get()->SetLockHandler(this);
1258 1258
1259 if (delegate_) 1259 if (delegate_)
1260 delegate_->OnSigninScreenReady(); 1260 delegate_->OnSigninScreenReady();
1261 } 1261 }
1262 1262
1263 void SigninScreenHandler::HandleWallpaperReady() { 1263 void SigninScreenHandler::HandleWallpaperReady() {
1264 if (ScreenLocker::default_screen_locker()) { 1264 if (ScreenLocker::default_screen_locker()) {
1265 ScreenLocker::default_screen_locker()->delegate()-> 1265 ScreenLocker::default_screen_locker()->delegate()->
1266 OnLockBackgroundDisplayed(); 1266 OnLockBackgroundDisplayed();
1267 } 1267 }
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
1606 return gaia_screen_handler_->frame_error(); 1606 return gaia_screen_handler_->frame_error();
1607 } 1607 }
1608 1608
1609 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1609 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1610 caps_lock_enabled_ = enabled; 1610 caps_lock_enabled_ = enabled;
1611 if (page_is_ready()) 1611 if (page_is_ready())
1612 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1612 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1613 } 1613 }
1614 1614
1615 } // namespace chromeos 1615 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698