Index: chrome/browser/signin/easy_unlock_service.cc |
diff --git a/chrome/browser/signin/easy_unlock_service.cc b/chrome/browser/signin/easy_unlock_service.cc |
index 1afcbc9e128e45c78b357f083d75025b091eac08..3a093a1d3bbad7b0eeaaffd2dc4c8ea233945eac 100644 |
--- a/chrome/browser/signin/easy_unlock_service.cc |
+++ b/chrome/browser/signin/easy_unlock_service.cc |
@@ -13,7 +13,9 @@ |
#include "chrome/browser/extensions/component_loader.h" |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h" |
#include "chrome/browser/signin/easy_unlock_service_factory.h" |
+#include "chrome/browser/signin/screenlock_bridge.h" |
#include "chrome/browser/ui/extensions/application_launch.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/pref_names.h" |
@@ -45,7 +47,12 @@ EasyUnlockService* EasyUnlockService::Get(Profile* profile) { |
} |
EasyUnlockService::EasyUnlockService(Profile* profile) |
- : profile_(profile), weak_ptr_factory_(this) { |
+ : profile_(profile), |
+ screenlock_state_handler_(new EasyUnlockScreenlockStateHandler( |
+ ScreenlockBridge::GetAuthenticatedUserEmail(profile), |
xiyuan
2014/08/12 18:09:47
EasyUnlockService is created with profile. Authent
tbarzic
2014/08/12 19:14:36
Done. Now creating |screenlock_state_handler_| laz
dzhioev (left Google)
2014/08/12 19:36:09
Confirm. Authenticated user name definitely is not
tbarzic
2014/08/12 21:40:58
OK, changed the app loading logic to allow the app
dzhioev (left Google)
2014/08/13 15:43:19
I'm not sure, but I would not rely on it.
Why do y
xiyuan
2014/08/13 15:53:41
Tony has changed to lazily create |screenlock_stat
|
+ profile->GetPrefs(), |
+ ScreenlockBridge::Get())), |
+ weak_ptr_factory_(this) { |
extensions::ExtensionSystem::Get(profile_)->ready().Post( |
FROM_HERE, |
base::Bind(&EasyUnlockService::Initialize, |