OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/chromeos/login/lock/screen_locker.h" | 5 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "base/timer/timer.h" | 26 #include "base/timer/timer.h" |
27 #include "chrome/browser/chrome_notification_types.h" | 27 #include "chrome/browser/chrome_notification_types.h" |
28 #include "chrome/browser/chromeos/login/auth/login_performer.h" | 28 #include "chrome/browser/chromeos/login/auth/login_performer.h" |
29 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h" | 29 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h" |
30 #include "chrome/browser/chromeos/login/login_utils.h" | 30 #include "chrome/browser/chromeos/login/login_utils.h" |
31 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" | 31 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" |
32 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 32 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
33 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 33 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
34 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 34 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
35 #include "chrome/browser/lifetime/application_lifetime.h" | 35 #include "chrome/browser/lifetime/application_lifetime.h" |
| 36 #include "chrome/browser/signin/easy_unlock_service.h" |
36 #include "chrome/browser/signin/signin_manager_factory.h" | 37 #include "chrome/browser/signin/signin_manager_factory.h" |
37 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h" | 38 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_provider.h" |
38 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h" | 39 #include "chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h" |
39 #include "chrome/common/chrome_switches.h" | 40 #include "chrome/common/chrome_switches.h" |
40 #include "chrome/grit/browser_resources.h" | 41 #include "chrome/grit/browser_resources.h" |
41 #include "chrome/grit/generated_resources.h" | 42 #include "chrome/grit/generated_resources.h" |
42 #include "chromeos/audio/chromeos_sounds.h" | 43 #include "chromeos/audio/chromeos_sounds.h" |
43 #include "chromeos/dbus/dbus_thread_manager.h" | 44 #include "chromeos/dbus/dbus_thread_manager.h" |
44 #include "chromeos/dbus/session_manager_client.h" | 45 #include "chromeos/dbus/session_manager_client.h" |
45 #include "chromeos/login/auth/authenticator.h" | 46 #include "chromeos/login/auth/authenticator.h" |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 } | 207 } |
207 | 208 |
208 const user_manager::User* user = | 209 const user_manager::User* user = |
209 user_manager::UserManager::Get()->FindUser(user_context.GetUserID()); | 210 user_manager::UserManager::Get()->FindUser(user_context.GetUserID()); |
210 if (user) { | 211 if (user) { |
211 if (!user->is_active()) { | 212 if (!user->is_active()) { |
212 saved_ime_state_ = NULL; | 213 saved_ime_state_ = NULL; |
213 user_manager::UserManager::Get()->SwitchActiveUser( | 214 user_manager::UserManager::Get()->SwitchActiveUser( |
214 user_context.GetUserID()); | 215 user_context.GetUserID()); |
215 } | 216 } |
| 217 EasyUnlockService* easy_unlock = EasyUnlockService::GetForUser(*user); |
| 218 if (easy_unlock) |
| 219 easy_unlock->SetHardlocked(false); |
216 } else { | 220 } else { |
217 NOTREACHED() << "Logged in user not found."; | 221 NOTREACHED() << "Logged in user not found."; |
218 } | 222 } |
219 | 223 |
220 authentication_capture_.reset(new AuthenticationParametersCapture()); | 224 authentication_capture_.reset(new AuthenticationParametersCapture()); |
221 authentication_capture_->user_context = user_context; | 225 authentication_capture_->user_context = user_context; |
222 | 226 |
223 // Add guard for case when something get broken in call chain to unlock | 227 // Add guard for case when something get broken in call chain to unlock |
224 // for sure. | 228 // for sure. |
225 base::MessageLoop::current()->PostDelayedTask( | 229 base::MessageLoop::current()->PostDelayedTask( |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
518 for (user_manager::UserList::const_iterator it = users_.begin(); | 522 for (user_manager::UserList::const_iterator it = users_.begin(); |
519 it != users_.end(); | 523 it != users_.end(); |
520 ++it) { | 524 ++it) { |
521 if ((*it)->email() == username) | 525 if ((*it)->email() == username) |
522 return true; | 526 return true; |
523 } | 527 } |
524 return false; | 528 return false; |
525 } | 529 } |
526 | 530 |
527 } // namespace chromeos | 531 } // namespace chromeos |
OLD | NEW |