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

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: fixes + git cl format Created 6 years, 1 month 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/signin/screenlock_bridge.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | 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 <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 1224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1235 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) { 1235 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
1236 if (core_oobe_actor_) { 1236 if (core_oobe_actor_) {
1237 core_oobe_actor_->ShowDeviceResetScreen(); 1237 core_oobe_actor_->ShowDeviceResetScreen();
1238 return; 1238 return;
1239 } 1239 }
1240 } 1240 }
1241 1241
1242 is_account_picker_showing_first_time_ = true; 1242 is_account_picker_showing_first_time_ = true;
1243 gaia_screen_handler_->MaybePreloadAuthExtension(); 1243 gaia_screen_handler_->MaybePreloadAuthExtension();
1244 1244
1245 ScreenlockBridge::Get()->SetLockHandler(this);
1245 if (ScreenLocker::default_screen_locker()) { 1246 if (ScreenLocker::default_screen_locker()) {
1246 ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady(); 1247 ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady();
1247 } 1248 }
1248 ScreenlockBridge::Get()->SetLockHandler(this);
1249 1249
1250 if (delegate_) 1250 if (delegate_)
1251 delegate_->OnSigninScreenReady(); 1251 delegate_->OnSigninScreenReady();
1252 } 1252 }
1253 1253
1254 void SigninScreenHandler::HandleWallpaperReady() { 1254 void SigninScreenHandler::HandleWallpaperReady() {
1255 if (ScreenLocker::default_screen_locker()) { 1255 if (ScreenLocker::default_screen_locker()) {
1256 ScreenLocker::default_screen_locker()->delegate()-> 1256 ScreenLocker::default_screen_locker()->delegate()->
1257 OnLockBackgroundDisplayed(); 1257 OnLockBackgroundDisplayed();
1258 } 1258 }
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
1586 return gaia_screen_handler_->frame_error(); 1586 return gaia_screen_handler_->frame_error();
1587 } 1587 }
1588 1588
1589 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1589 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1590 caps_lock_enabled_ = enabled; 1590 caps_lock_enabled_ = enabled;
1591 if (page_is_ready()) 1591 if (page_is_ready())
1592 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1592 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1593 } 1593 }
1594 1594
1595 } // namespace chromeos 1595 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/signin/screenlock_bridge.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698